update linter

Author: sivchari

tenv.go

@@ -40,23 +40,22 @@ func run(pass *analysis.Pass) (interface{}, error) {
 	inspect.Preorder(nodeFilter, func(n ast.Node) {
 		switch n := n.(type) {
 		case *ast.File:
-			if strings.HasSuffix(pass.Fset.File(n.Pos()).Name(), "_test.go") {
-				for _, decl := range n.Decls {
-					funcDecl, ok := decl.(*ast.FuncDecl)
-					if !ok {
-						continue
-					}
-					checkFunc(pass, funcDecl)
+			for _, decl := range n.Decls {
+
+				funcDecl, ok := decl.(*ast.FuncDecl)
+				if !ok {
+					continue
 				}
+				checkFunc(pass, funcDecl, pass.Fset.File(n.Pos()).Name())
 			}
 		}
 	})
 
 	return nil, nil
 }
 
-func checkFunc(pass *analysis.Pass, n *ast.FuncDecl) {
-	argName, ok := targetRunner(n)
+func checkFunc(pass *analysis.Pass, n *ast.FuncDecl, fileName string) {
+	argName, ok := targetRunner(n, fileName)
 	if ok {
 		for _, stmt := range n.Body.List {
 			switch stmt := stmt.(type) {
@@ -150,7 +149,7 @@ func checkAssignStmt(pass *analysis.Pass, stmt *ast.AssignStmt, n *ast.FuncDecl,
 	return true
 }
 
-func targetRunner(funcDecl *ast.FuncDecl) (string, bool) {
+func targetRunner(funcDecl *ast.FuncDecl, fileName string) (string, bool) {
 	params := funcDecl.Type.Params.List
 	for _, p := range params {
 		switch typ := p.Type.(type) {
@@ -166,7 +165,7 @@ func targetRunner(funcDecl *ast.FuncDecl) (string, bool) {
 			}
 		}
 	}
-	if aflag {
+	if aflag && strings.HasSuffix(fileName, "_test.go") {
 		return "", true
 	}
 	return "", false

testdata/src/a/a.go

@@ -0,0 +1,48 @@
+package a
+
+import (
+	"os"
+	"testing"
+)
+
+var (
+	ee = os.Setenv("a", "b") // never seen
+)
+
+func setup() {
+	os.Setenv("a", "b")        // never seen
+	err := os.Setenv("a", "b") // never seen
+	if err != nil {
+		_ = err
+	}
+	os.Setenv("a", "b") // never seen
+}
+
+func F(t *testing.T) {
+	setup()
+	os.Setenv("a", "b")        // want "os\\.Setenv\\(\\) can be replaced by `t\\.Setenv\\(\\)` in F"
+	err := os.Setenv("a", "b") // want "os\\.Setenv\\(\\) can be replaced by `t\\.Setenv\\(\\)` in F"
+	_ = err
+	if err := os.Setenv("a", "b"); err != nil { // want "os\\.Setenv\\(\\) can be replaced by `t\\.Setenv\\(\\)` in F"
+		_ = err
+	}
+}
+
+func BF(b *testing.B) {
+	TBF(b)
+	os.Setenv("a", "b")        // want "os\\.Setenv\\(\\) can be replaced by `b\\.Setenv\\(\\)` in BF"
+	err := os.Setenv("a", "b") // want "os\\.Setenv\\(\\) can be replaced by `b\\.Setenv\\(\\)` in BF"
+	_ = err
+	if err := os.Setenv("a", "b"); err != nil { // want "os\\.Setenv\\(\\) can be replaced by `b\\.Setenv\\(\\)` in BF"
+		_ = err
+	}
+}
+
+func TBF(tb testing.TB) {
+	os.Setenv("a", "b")        // want "os\\.Setenv\\(\\) can be replaced by `tb\\.Setenv\\(\\)` in TBF"
+	err := os.Setenv("a", "b") // want "os\\.Setenv\\(\\) can be replaced by `tb\\.Setenv\\(\\)` in TBF"
+	_ = err
+	if err := os.Setenv("a", "b"); err != nil { // want "os\\.Setenv\\(\\) can be replaced by `tb\\.Setenv\\(\\)` in TBF"
+		_ = err
+	}
+}

testdata/src/a/a_test.go

@@ -9,17 +9,17 @@ var (
 	e = os.Setenv("a", "b") // never seen
 )
 
-func setup() {
-	os.Setenv("a", "b")        // if -all = true, want  "os\\.Setenv\\(\\) can be replaced by `testing\\.Setenv\\(\\)` in setup"
-	err := os.Setenv("a", "b") // if -all = true, want  "os\\.Setenv\\(\\) can be replaced by `testing\\.Setenv\\(\\)` in setup"
+func testsetup() {
+	os.Setenv("a", "b")        // if -all = true, want  "os\\.Setenv\\(\\) can be replaced by `testing\\.Setenv\\(\\)` in testsetup"
+	err := os.Setenv("a", "b") // if -all = true, want  "os\\.Setenv\\(\\) can be replaced by `testing\\.Setenv\\(\\)` in testsetup"
 	if err != nil {
 		_ = err
 	}
 	os.Setenv("a", "b") // if -all = true, "func setup is not using testing.Setenv"
 }
 
 func TestF(t *testing.T) {
-	setup()
+	testsetup()
 	os.Setenv("a", "b")        // want "os\\.Setenv\\(\\) can be replaced by `t\\.Setenv\\(\\)` in TestF"
 	err := os.Setenv("a", "b") // want "os\\.Setenv\\(\\) can be replaced by `t\\.Setenv\\(\\)` in TestF"
 	_ = err
@@ -29,7 +29,7 @@ func TestF(t *testing.T) {
 }
 
 func BenchmarkF(b *testing.B) {
-	testTB(b)
+	TB(b)
 	os.Setenv("a", "b")        // want "os\\.Setenv\\(\\) can be replaced by `b\\.Setenv\\(\\)` in BenchmarkF"
 	err := os.Setenv("a", "b") // want "os\\.Setenv\\(\\) can be replaced by `b\\.Setenv\\(\\)` in BenchmarkF"
 	_ = err
@@ -38,6 +38,11 @@ func BenchmarkF(b *testing.B) {
 	}
 }
 
-func testTB(tb testing.TB) {
-	os.Setenv("a", "b") // want "os\\.Setenv\\(\\) can be replaced by `tb\\.Setenv\\(\\)` in testTB"
+func TB(tb testing.TB) {
+	os.Setenv("a", "b")        // want "os\\.Setenv\\(\\) can be replaced by `tb\\.Setenv\\(\\)` in TB"
+	err := os.Setenv("a", "b") // want "os\\.Setenv\\(\\) can be replaced by `tb\\.Setenv\\(\\)` in TB"
+	_ = err
+	if err := os.Setenv("a", "b"); err != nil { // want "os\\.Setenv\\(\\) can be replaced by `tb\\.Setenv\\(\\)` in TB"
+		_ = err
+	}
 }