feat: skip name and begin checks if name is

kulti · Feb 6, 2021 · 7415afb · 7415afb
1 parent 1c4fa19
commit 7415afb
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 7 deletions.
diff --git a/pkg/analyzer/analyzer.go b/pkg/analyzer/analyzer.go
@@ -261,15 +261,17 @@ func checkFunc(pass *analysis.Pass, reports *reports, funcDecl funcDecl, opts ch
 		}
 	}
 
-	if opts.checkName {
-		if len(p.Names) > 0 && p.Names[0].Name != opts.varName {
-			reports.Reportf(funcDecl.Pos, "parameter %s should have name %s", opts.tbType, opts.varName)
+	if len(p.Names) > 0 && p.Names[0].Name != "_" {
+		if opts.checkName {
+			if p.Names[0].Name != opts.varName {
+				reports.Reportf(funcDecl.Pos, "parameter %s should have name %s", opts.tbType, opts.varName)
+			}
 		}
-	}
 
-	if opts.checkBegin {
-		if len(funcDecl.Body.List) == 0 || !isTHelperCall(pass, funcDecl.Body.List[0], opts.tbHelper) {
-			reports.Reportf(funcDecl.Pos, "test helper function should start from %s.Helper()", opts.varName)
+		if opts.checkBegin {
+			if len(funcDecl.Body.List) == 0 || !isTHelperCall(pass, funcDecl.Body.List[0], opts.tbHelper) {
+				reports.Reportf(funcDecl.Pos, "test helper function should start from %s.Helper()", opts.varName)
+			}
 		}
 	}
 }

diff --git a/pkg/analyzer/testdata/src/b/b.go b/pkg/analyzer/testdata/src/b/b.go
diff --git a/pkg/analyzer/testdata/src/b_begin/b.go b/pkg/analyzer/testdata/src/b_begin/b.go
diff --git a/pkg/analyzer/testdata/src/b_first/b.go b/pkg/analyzer/testdata/src/b_first/b.go
diff --git a/pkg/analyzer/testdata/src/b_name/b.go b/pkg/analyzer/testdata/src/b_name/b.go
diff --git a/pkg/analyzer/testdata/src/t/t.go b/pkg/analyzer/testdata/src/t/t.go
diff --git a/pkg/analyzer/testdata/src/t_begin/t.go b/pkg/analyzer/testdata/src/t_begin/t.go
diff --git a/pkg/analyzer/testdata/src/t_first/t.go b/pkg/analyzer/testdata/src/t_first/t.go
diff --git a/pkg/analyzer/testdata/src/t_name/t.go b/pkg/analyzer/testdata/src/t_name/t.go
diff --git a/scripts/generator/generator.go b/scripts/generator/generator.go
@@ -67,6 +67,9 @@ func helperWithAnonymousHelper({{.Name}} *testing.{{.UName}}) {
 	func({{.Name}} *testing.{{.UName}}) {}({{.Name}}) {{if or (eq .Check "") (eq .Check "begin")}}// want "test helper function should start from {{.Name}}.Helper()"{{end}}
 }
 
+func helperWithNoName(_ *testing.{{.UName}}) {
+}
+
 func f() {}
 `
-Original file line number
+Diff line change
@@ Expand Up @@
     	func({{.Name}} *testing.{{.UName}}) {}({{.Name}}) {{if or (eq .Check "") (eq .Check "begin")}}// want "test helper function should start from {{.Name}}.Helper()"{{end}}
     }
+    func helperWithNoName(_ *testing.{{.UName}}) {
+    }
     func f() {}
     `
@@ Expand Down @@