Merge pull request #92 from k1LoW/errorstrings.exclude-test

Add errorstrings.exclude-test

README.md

@@ -142,6 +142,7 @@ analyzers-settings:
 analyzers-settings:
   errorstrings:
     include-generated: false # include generated codes (default: false)
+    exclude-test: true       # exclude test files (default: false)
 ```
 
 #### funcfmt

analyzer/code_review_comments/errorstrings/errorstrings.go

@@ -23,6 +23,7 @@ const (
 var (
 	disable          bool
 	includeGenerated bool
+	excludeTest      bool
 )
 
 // Analyzer based on https://github.com/golang/go/wiki/CodeReviewComments#error-strings
@@ -56,6 +57,7 @@ func run(pass *analysis.Pass) (any, error) {
 	if c != nil {
 		disable = c.IsDisabled(name)
 		includeGenerated = c.AnalyzersSettings.Errorstrings.IncludeGenerated
+		excludeTest = c.AnalyzersSettings.Errorstrings.ExcludeTest
 	}
 	if disable {
 		return nil, nil
@@ -78,6 +80,11 @@ func run(pass *analysis.Pass) (any, error) {
 		return nil, err
 	}
 	i.Preorder(nodeFilter, func(n ast.Node) {
+		if excludeTest {
+			if strings.HasSuffix(pass.Fset.File(n.Pos()).Name(), "_test.go") {
+				return
+			}
+		}
 		switch e := n.(type) {
 		case *ast.CallExpr:
 			if len(e.Args) == 0 {
@@ -124,4 +131,5 @@ func isNG(in string) bool {
 func init() {
 	Analyzer.Flags.BoolVar(&disable, "disable", false, "disable "+name+" analyzer")
 	Analyzer.Flags.BoolVar(&includeGenerated, "include-generated", false, "include generated codes")
+	Analyzer.Flags.BoolVar(&excludeTest, "exclude-test", false, "exclude test files")
 }

analyzer/code_review_comments/errorstrings/errorstrings_test.go

@@ -9,6 +9,7 @@ import (
 
 // TestAnalyzer is a test for Analyzer.
 func TestAnalyzer(t *testing.T) {
+	excludeTest = true
 	td := testutil.WithModules(t, analysistest.TestData(), nil)
 	analysistest.Run(t, td, Analyzer, "a")
 }

analyzer/code_review_comments/errorstrings/testdata/src/a/a_test.go

@@ -0,0 +1,7 @@
+package a
+
+import "testing"
+
+func TestA(t *testing.T) {
+	t.Errorf("This is %s", "world")
+}

analyzer/code_review_comments/handlerrors/handlerrors.go

@@ -90,6 +90,11 @@ func run(pass *analysis.Pass) (any, error) {
 	}
 
 	i.Preorder(nodeFilter, func(n ast.Node) {
+		if excludeTest {
+			if strings.HasSuffix(pass.Fset.File(n.Pos()).Name(), "_test.go") {
+				return
+			}
+		}
 		switch nn := n.(type) {
 		case *ast.AssignStmt:
 			if len(nn.Rhs) == 0 {
@@ -107,11 +112,6 @@ func run(pass *analysis.Pass) (any, error) {
 				if id.Name != "_" {
 					continue
 				}
-				if excludeTest {
-					if strings.HasSuffix(pass.Fset.File(e.Pos()).Name(), "_test.go") {
-						return
-					}
-				}
 				br.report(e, i)
 			}
 		}

config/config.go

@@ -61,6 +61,7 @@ type Dontpanic struct {
 
 type Errorstrings struct {
 	IncludeGenerated bool `yaml:"include-generated"`
+	ExcludeTest      bool `yaml:"exclude-test"`
 }
 
 type Funcfmt struct {