feat: support subtest builder as anonymous function and fixture method

Author: kulti

pkg/analyzer/analyzer.go

@@ -406,23 +406,38 @@ func unwrapTestingFunctionBuilding(pass *analysis.Pass, expr ast.Expr, testFuncT
 		return nil
 	}
 
-	funIdent, ok := callExpr.Fun.(*ast.Ident)
-	if !ok {
-		return nil
-	}
+	var funcDecl funcDecl
+	switch f := callExpr.Fun.(type) {
+	case *ast.FuncLit:
+		funcDecl.Body = f.Body
+		funcDecl.Type = f.Type
+	case *ast.Ident:
+		funObjDecl, ok := f.Obj.Decl.(*ast.FuncDecl)
+		if !ok {
+			return nil
+		}
 
-	funDecl, ok := funIdent.Obj.Decl.(*ast.FuncDecl)
-	if !ok {
+		funcDecl.Body = funObjDecl.Body
+		funcDecl.Type = funObjDecl.Type
+	case *ast.SelectorExpr:
+		fd := findSelectroDeclaration(pass, f)
+		if fd == nil {
+			return nil
+		}
+
+		funcDecl.Body = fd.Body
+		funcDecl.Type = fd.Type
+	default:
 		return nil
 	}
 
-	results := funDecl.Type.Results.List
+	results := funcDecl.Type.Results.List
 	if len(results) != 1 || !isExprHasType(pass, results[0].Type, testFuncType) {
 		return nil
 	}
 
 	var funcs []ast.Expr
-	ast.Inspect(funDecl.Body, func(n ast.Node) bool {
+	ast.Inspect(funcDecl.Body, func(n ast.Node) bool {
 		if n == nil {
 			return false
 		}
@@ -483,3 +498,38 @@ func isExprHasType(pass *analysis.Pass, expr ast.Expr, expType types.Type) bool
 
 	return types.Identical(typeInfo.Type, expType)
 }
+
+// findSelectroDeclaration returns function declaration called by selectro expression.
+func findSelectroDeclaration(pass *analysis.Pass, expr *ast.SelectorExpr) *ast.FuncDecl {
+	xsel, ok := pass.TypesInfo.Selections[expr]
+	if !ok {
+		return nil
+	}
+
+	for _, file := range pass.Files {
+		for _, decl := range file.Decls {
+			fd, ok := decl.(*ast.FuncDecl)
+			if ok && fd.Recv != nil && len(fd.Recv.List) == 1 {
+				recvType, ok := fd.Recv.List[0].Type.(*ast.Ident)
+				if !ok {
+					continue
+				}
+
+				recvObj, ok := pass.TypesInfo.Uses[recvType]
+				if !ok {
+					continue
+				}
+
+				if !(types.Identical(recvObj.Type(), xsel.Recv())) {
+					continue
+				}
+
+				if fd.Name.Name == expr.Sel.Name {
+					return fd
+				}
+			}
+		}
+	}
+
+	return nil
+}

pkg/analyzer/testdata/src/t/s.go

@@ -34,8 +34,12 @@ func (sh subhelper) check(t *testing.T) {
 func (sh subhelper) anotherCheck(t *testing.T) {} // want "test helper function should start from t.Helper()"
 
 func TestSubtestWithBuilder(t *testing.T) {
-	t.Run("sub", subtestBuilder("first"))
-	t.Run("sub", subtestBuilder("second"))
+	t.Run("sub1", subtestBuilder("first"))
+	t.Run("sub2", subtestBuilder("second"))
+	t.Run("anon", func() func(t *testing.T) { return func(t *testing.T) {} }())
+
+	fixture := subtestFixture{}
+	t.Run("sel", fixture.subtest())
 }
 
 func subtestBuilder(name string) func(t *testing.T) {
@@ -44,3 +48,9 @@ func subtestBuilder(name string) func(t *testing.T) {
 	}
 	return func(t *testing.T) {}
 }
+
+type subtestFixture struct{}
+
+func (f subtestFixture) subtest() func(t *testing.T) {
+	return func(t *testing.T) {}
+}