Merge pull request #101 from k1LoW/exclude-dirs

Add `exclude-files:` section for excluding files from analysis
k1LoW · Apr 22, 2024 · ba84fef · ba84fef
2 parents 8638ff5 + 46bd94f
commit ba84fef
Show file tree

Hide file tree

Showing 24 changed files with 82 additions and 19 deletions.
diff --git a/.gostyle.yml.init b/.gostyle.yml.init
@@ -15,3 +15,5 @@ analyzers:
 #    medium-varname-max: 8      # max length of variable name for medium scope (default: -1)
 #    large-varname-max: 16      # max length of variable name for large scope (default: -1)
 #    very-large-varname-max: 32 # max length of variable name for very large scope (default: -1)
+# exclude-files: # exclude files from analysis
+#   - path/to/**/*.go
diff --git a/analyzer/code_review_comments/contexts/contexts.go b/analyzer/code_review_comments/contexts/contexts.go
@@ -54,10 +54,12 @@ func run(pass *analysis.Pass) (any, error) {
 	if err != nil {
 		return nil, err
 	}
+	var opts []reporter.Option
 	if c != nil {
 		disable = c.IsDisabled(name)
 		includeGenerated = c.AnalyzersSettings.Contexts.IncludeGenerated
 		excludeTest = c.AnalyzersSettings.Contexts.ExcludeTest
+		opts = append(opts, reporter.ExcludeFiles(c.ConfigDir, c.ExcludeFiles))
 	}
 	if disable {
 		return nil, nil
@@ -73,7 +75,6 @@ func run(pass *analysis.Pass) (any, error) {
 		(*ast.StructType)(nil),
 	}
 
-	var opts []reporter.Option
 	if includeGenerated {
 		opts = append(opts, reporter.IncludeGenerated())
 	}

diff --git a/analyzer/code_review_comments/dontpanic/dontpanic.go b/analyzer/code_review_comments/dontpanic/dontpanic.go
@@ -53,10 +53,13 @@ func run(pass *analysis.Pass) (any, error) {
 	if err != nil {
 		return nil, err
 	}
+
+	var opts []reporter.Option
 	if c != nil {
 		disable = c.IsDisabled(name)
 		includeGenerated = c.AnalyzersSettings.Dontpanic.IncludeGenerated
 		excludeTest = c.AnalyzersSettings.Dontpanic.ExcludeTest
+		opts = append(opts, reporter.ExcludeFiles(c.ConfigDir, c.ExcludeFiles))
 	}
 	if disable {
 		return nil, nil
@@ -70,7 +73,6 @@ func run(pass *analysis.Pass) (any, error) {
 		(*ast.CallExpr)(nil),
 	}
 
-	var opts []reporter.Option
 	if includeGenerated {
 		opts = append(opts, reporter.IncludeGenerated())
 	}

diff --git a/analyzer/code_review_comments/errorstrings/errorstrings.go b/analyzer/code_review_comments/errorstrings/errorstrings.go
@@ -54,10 +54,12 @@ func run(pass *analysis.Pass) (any, error) {
 	if err != nil {
 		return nil, err
 	}
+	var opts []reporter.Option
 	if c != nil {
 		disable = c.IsDisabled(name)
 		includeGenerated = c.AnalyzersSettings.Errorstrings.IncludeGenerated
 		excludeTest = c.AnalyzersSettings.Errorstrings.ExcludeTest
+		opts = append(opts, reporter.ExcludeFiles(c.ConfigDir, c.ExcludeFiles))
 	}
 	if disable {
 		return nil, nil
@@ -71,7 +73,6 @@ func run(pass *analysis.Pass) (any, error) {
 		(*ast.CallExpr)(nil),
 	}
 
-	var opts []reporter.Option
 	if includeGenerated {
 		opts = append(opts, reporter.IncludeGenerated())
 	}

diff --git a/analyzer/code_review_comments/handlerrors/handlerrors.go b/analyzer/code_review_comments/handlerrors/handlerrors.go
@@ -58,10 +58,12 @@ func run(pass *analysis.Pass) (any, error) {
 	if err != nil {
 		return nil, err
 	}
+	var opts []reporter.Option
 	if c != nil {
 		disable = c.IsDisabled(name)
 		includeGenerated = c.AnalyzersSettings.Handlerrors.IncludeGenerated
 		excludeTest = c.AnalyzersSettings.Handlerrors.ExcludeTest
+		opts = append(opts, reporter.ExcludeFiles(c.ConfigDir, c.ExcludeFiles))
 	}
 	if disable {
 		return nil, nil
@@ -75,7 +77,6 @@ func run(pass *analysis.Pass) (any, error) {
 		(*ast.AssignStmt)(nil),
 	}
 
-	var opts []reporter.Option
 	if includeGenerated {
 		opts = append(opts, reporter.IncludeGenerated())
 	}

diff --git a/analyzer/decisions/funcfmt/funcfmt.go b/analyzer/decisions/funcfmt/funcfmt.go
@@ -50,11 +50,14 @@ var AnalyzerWithConfig = &analysis.Analyzer{
 func run(pass *analysis.Pass) (any, error) {
 	c, err := config.Load(pass)
 	if err != nil {
+
 		return nil, err
 	}
+	var opts []reporter.Option
 	if c != nil {
 		disable = c.IsDisabled(name)
 		includeGenerated = c.AnalyzersSettings.Funcfmt.IncludeGenerated
+		opts = append(opts, reporter.ExcludeFiles(c.ConfigDir, c.ExcludeFiles))
 	}
 
 	if disable {
@@ -70,7 +73,6 @@ func run(pass *analysis.Pass) (any, error) {
 		(*ast.CallExpr)(nil),
 	}
 
-	var opts []reporter.Option
 	if includeGenerated {
 		opts = append(opts, reporter.IncludeGenerated())
 	}

diff --git a/analyzer/decisions/getters/getters.go b/analyzer/decisions/getters/getters.go
@@ -57,10 +57,12 @@ func run(pass *analysis.Pass) (any, error) {
 		return nil, err
 	}
 	words := strings.Split(exclude, ",")
+	var opts []reporter.Option
 	if c != nil {
 		disable = c.IsDisabled(name)
 		words = c.AnalyzersSettings.Getters.Exclude
 		includeGenerated = c.AnalyzersSettings.Getters.IncludeGenerated
+		opts = append(opts, reporter.ExcludeFiles(c.ConfigDir, c.ExcludeFiles))
 	}
 	if disable {
 		return nil, nil
@@ -77,7 +79,6 @@ func run(pass *analysis.Pass) (any, error) {
 		(*ast.AssignStmt)(nil),
 	}
 
-	var opts []reporter.Option
 	if includeGenerated {
 		opts = append(opts, reporter.IncludeGenerated())
 	}

diff --git a/analyzer/decisions/nilslices/nilslices.go b/analyzer/decisions/nilslices/nilslices.go
@@ -54,9 +54,11 @@ func run(pass *analysis.Pass) (any, error) {
 	if err != nil {
 		return nil, err
 	}
+	var opts []reporter.Option
 	if c != nil {
 		disable = c.IsDisabled(name)
 		includeGenerated = c.AnalyzersSettings.Nilslices.IncludeGenerated
+		opts = append(opts, reporter.ExcludeFiles(c.ConfigDir, c.ExcludeFiles))
 	}
 	if disable {
 		return nil, nil
@@ -72,7 +74,6 @@ func run(pass *analysis.Pass) (any, error) {
 		(*ast.BinaryExpr)(nil),
 	}
 
-	var opts []reporter.Option
 	if includeGenerated {
 		opts = append(opts, reporter.IncludeGenerated())
 	}

diff --git a/analyzer/decisions/pkgnames/pkgnames.go b/analyzer/decisions/pkgnames/pkgnames.go
@@ -60,9 +60,11 @@ func run(pass *analysis.Pass) (any, error) {
 	if err != nil {
 		return nil, err
 	}
+	var opts []reporter.Option
 	if c != nil {
 		disable = c.IsDisabled(name)
 		includeGenerated = c.AnalyzersSettings.Pkgnames.IncludeGenerated
+		opts = append(opts, reporter.ExcludeFiles(c.ConfigDir, c.ExcludeFiles))
 	}
 	if disable {
 		return nil, nil
@@ -77,7 +79,6 @@ func run(pass *analysis.Pass) (any, error) {
 		(*ast.ImportSpec)(nil),
 	}
 
-	var opts []reporter.Option
 	if includeGenerated {
 		opts = append(opts, reporter.IncludeGenerated())
 	}

diff --git a/analyzer/decisions/recvnames/recvnames.go b/analyzer/decisions/recvnames/recvnames.go
@@ -55,10 +55,12 @@ func run(pass *analysis.Pass) (any, error) {
 	if err != nil {
 		return nil, err
 	}
+	var opts []reporter.Option
 	if c != nil {
 		disable = c.IsDisabled(name)
 		includeGenerated = c.AnalyzersSettings.Recvnames.IncludeGenerated
 		max = c.AnalyzersSettings.Recvnames.Max
+		opts = append(opts, reporter.ExcludeFiles(c.ConfigDir, c.ExcludeFiles))
 	}
 
 	if disable {
@@ -73,7 +75,6 @@ func run(pass *analysis.Pass) (any, error) {
 		(*ast.FuncDecl)(nil),
 	}
 
-	var opts []reporter.Option
 	if includeGenerated {
 		opts = append(opts, reporter.IncludeGenerated())
 	}

diff --git a/analyzer/decisions/recvtype/recvtype.go b/analyzer/decisions/recvtype/recvtype.go
@@ -53,9 +53,11 @@ func run(pass *analysis.Pass) (any, error) {
 	if err != nil {
 		return nil, err
 	}
+	var opts []reporter.Option
 	if c != nil {
 		disable = c.IsDisabled(name)
 		includeGenerated = c.AnalyzersSettings.Recvtype.IncludeGenerated
+		opts = append(opts, reporter.ExcludeFiles(c.ConfigDir, c.ExcludeFiles))
 	}
 
 	if disable {
@@ -70,7 +72,6 @@ func run(pass *analysis.Pass) (any, error) {
 		(*ast.FuncDecl)(nil),
 	}
 
-	var opts []reporter.Option
 	if includeGenerated {
 		opts = append(opts, reporter.IncludeGenerated())
 	}

diff --git a/analyzer/decisions/repetition/repetition.go b/analyzer/decisions/repetition/repetition.go
@@ -59,10 +59,12 @@ func run(pass *analysis.Pass) (any, error) {
 		return nil, err
 	}
 	words := strings.Split(exclude, ",")
+	var opts []reporter.Option
 	if c != nil {
 		disable = c.IsDisabled(name)
 		includeGenerated = c.AnalyzersSettings.Recvnames.IncludeGenerated
 		words = c.AnalyzersSettings.Repetition.Exclude
+		opts = append(opts, reporter.ExcludeFiles(c.ConfigDir, c.ExcludeFiles))
 	}
 
 	if disable {
@@ -80,7 +82,6 @@ func run(pass *analysis.Pass) (any, error) {
 		(*ast.FuncDecl)(nil),
 	}
 
-	var opts []reporter.Option
 	if includeGenerated {
 		opts = append(opts, reporter.IncludeGenerated())
 	}

diff --git a/analyzer/decisions/typealiases/typealiases.go b/analyzer/decisions/typealiases/typealiases.go
@@ -55,10 +55,12 @@ func run(pass *analysis.Pass) (any, error) {
 		return nil, err
 	}
 	words := strings.Split(exclude, ",")
+	var opts []reporter.Option
 	if c != nil {
 		disable = c.IsDisabled(name)
 		words = c.AnalyzersSettings.Typealiases.Exclude
 		includeGenerated = c.AnalyzersSettings.Typealiases.IncludeGenerated
+		opts = append(opts, reporter.ExcludeFiles(c.ConfigDir, c.ExcludeFiles))
 	}
 	if disable {
 		return nil, nil
@@ -72,7 +74,6 @@ func run(pass *analysis.Pass) (any, error) {
 		(*ast.TypeSpec)(nil),
 	}
 
-	var opts []reporter.Option
 	if includeGenerated {
 		opts = append(opts, reporter.IncludeGenerated())
 	}

diff --git a/analyzer/decisions/underscores/underscores.go b/analyzer/decisions/underscores/underscores.go
@@ -57,10 +57,12 @@ func run(pass *analysis.Pass) (any, error) {
 		return nil, err
 	}
 	words := strings.Split(exclude, ",")
+	var opts []reporter.Option
 	if c != nil {
 		disable = c.IsDisabled(name)
 		words = c.AnalyzersSettings.Underscores.Exclude
 		includeGenerated = c.AnalyzersSettings.Underscores.IncludeGenerated
+		opts = append(opts, reporter.ExcludeFiles(c.ConfigDir, c.ExcludeFiles))
 	}
 	if disable {
 		return nil, nil
@@ -81,7 +83,6 @@ func run(pass *analysis.Pass) (any, error) {
 		(*ast.RangeStmt)(nil),
 	}
 
-	var opts []reporter.Option
 	if includeGenerated {
 		opts = append(opts, reporter.IncludeGenerated())
 	}

diff --git a/analyzer/decisions/useany/useany.go b/analyzer/decisions/useany/useany.go
@@ -52,9 +52,11 @@ func run(pass *analysis.Pass) (any, error) {
 	if err != nil {
 		return nil, err
 	}
+	var opts []reporter.Option
 	if c != nil {
 		disable = c.IsDisabled(name)
 		includeGenerated = c.AnalyzersSettings.Useany.IncludeGenerated
+		opts = append(opts, reporter.ExcludeFiles(c.ConfigDir, c.ExcludeFiles))
 	}
 	if disable {
 		return nil, nil
@@ -70,7 +72,6 @@ func run(pass *analysis.Pass) (any, error) {
 		(*ast.CompositeLit)(nil),
 	}
 
-	var opts []reporter.Option
 	if includeGenerated {
 		opts = append(opts, reporter.IncludeGenerated())
 	}

diff --git a/analyzer/decisions/useq/useq.go b/analyzer/decisions/useq/useq.go
@@ -57,9 +57,11 @@ func run(pass *analysis.Pass) (any, error) {
 	if err != nil {
 		return nil, err
 	}
+	var opts []reporter.Option
 	if c != nil {
 		disable = c.IsDisabled(name)
 		includeGenerated = c.AnalyzersSettings.Useq.IncludeGenerated
+		opts = append(opts, reporter.ExcludeFiles(c.ConfigDir, c.ExcludeFiles))
 	}
 	if disable {
 		return nil, nil
@@ -73,7 +75,6 @@ func run(pass *analysis.Pass) (any, error) {
 		(*ast.CallExpr)(nil),
 	}
 
-	var opts []reporter.Option
 	if includeGenerated {
 		opts = append(opts, reporter.IncludeGenerated())
 	}

diff --git a/analyzer/decisions/varnames/varnames.go b/analyzer/decisions/varnames/varnames.go
@@ -70,6 +70,7 @@ func run(pass *analysis.Pass) (any, error) {
 		return nil, err
 	}
 	words := strings.Split(exclude, ",")
+	var opts []reporter.Option
 	if c != nil {
 		disable = c.IsDisabled(name)
 		words = c.AnalyzersSettings.Varnames.Exclude
@@ -81,6 +82,7 @@ func run(pass *analysis.Pass) (any, error) {
 		largeScopeMax = c.AnalyzersSettings.Varnames.LargeScopeMax
 		largeVarnameMax = c.AnalyzersSettings.Varnames.LargeVarnameMax
 		veryLargeVarnameMax = c.AnalyzersSettings.Varnames.VeryLargeVarnameMax
+		opts = append(opts, reporter.ExcludeFiles(c.ConfigDir, c.ExcludeFiles))
 	}
 	if disable {
 		return nil, nil
@@ -101,7 +103,6 @@ func run(pass *analysis.Pass) (any, error) {
 		(*ast.RangeStmt)(nil),
 	}
 
-	var opts []reporter.Option
 	if includeGenerated {
 		opts = append(opts, reporter.IncludeGenerated())
 	}

diff --git a/analyzer/effective/ifacenames/ifacenames.go b/analyzer/effective/ifacenames/ifacenames.go
@@ -56,10 +56,12 @@ func run(pass *analysis.Pass) (any, error) {
 	if err != nil {
 		return nil, err
 	}
+	var opts []reporter.Option
 	if c != nil {
 		disable = c.IsDisabled(name)
 		includeGenerated = c.AnalyzersSettings.Ifacenames.IncludeGenerated
 		all = c.AnalyzersSettings.Ifacenames.All
+		opts = append(opts, reporter.ExcludeFiles(c.ConfigDir, c.ExcludeFiles))
 	}
 	if disable {
 		return nil, nil
@@ -75,7 +77,6 @@ func run(pass *analysis.Pass) (any, error) {
 	}
 
 	var ii *ast.Ident
-	var opts []reporter.Option
 	if includeGenerated {
 		opts = append(opts, reporter.IncludeGenerated())
 	}

diff --git a/analyzer/guide/mixedcaps/mixedcaps.go b/analyzer/guide/mixedcaps/mixedcaps.go
@@ -57,10 +57,12 @@ func run(pass *analysis.Pass) (any, error) {
 		return nil, err
 	}
 	words := strings.Split(exclude, ",")
+	var opts []reporter.Option
 	if c != nil {
 		disable = c.IsDisabled(name)
 		words = c.AnalyzersSettings.Mixedcaps.Exclude
 		includeGenerated = c.AnalyzersSettings.Mixedcaps.IncludeGenerated
+		opts = append(opts, reporter.ExcludeFiles(c.ConfigDir, c.ExcludeFiles))
 	}
 	if disable {
 		return nil, nil
@@ -81,7 +83,6 @@ func run(pass *analysis.Pass) (any, error) {
 		(*ast.RangeStmt)(nil),
 	}
 
-	var opts []reporter.Option
 	if includeGenerated {
 		opts = append(opts, reporter.IncludeGenerated())
 	}

diff --git a/config/config.go b/config/config.go
@@ -20,6 +20,8 @@ const (
 type Config struct {
 	Analyzers         Analyzers         `yaml:"analyzers"`
 	AnalyzersSettings AnalyzersSettings `yaml:"analyzers-settings"`
+	ExcludeFiles      []string          `yaml:"exclude-files"`
+	ConfigDir         string            `yaml:"-"`
 	loaded            bool
 	err               error
 }