cosmetis

Author: Antonboom

CONTRIBUTING.md

@@ -99,6 +99,8 @@ Remember that [assert.TestingT](https://pkg.go.dev/github.com/stretchr/testify/a
 [require.TestingT](https://pkg.go.dev/github.com/stretchr/testify/require#TestingT) are different interfaces,
 which may be important in some contexts.
 
+Also, pay attention to `internal/checkers/helpers_*.go` files. Try to reuse existing code as much as possible.
+
 ### 8) Improve tests from p.4 if necessary
 
 Pay attention to `Assertion` and `NewAssertionExpander`, but keep your tests as small as possible.

internal/checkers/helpers_context.go

@@ -97,3 +97,30 @@ func findNearestNodeWithIdx[T ast.Node](stack []ast.Node) (v T, index int) {
 	}
 	return
 }
+
+func fnContainsAssertions(pass *analysis.Pass, fn *ast.FuncDecl) bool {
+	if fn.Body == nil {
+		return false
+	}
+
+	for _, s := range fn.Body.List {
+		if isAssertionStmt(pass, s) {
+			return true
+		}
+	}
+	return false
+}
+
+func isAssertionStmt(pass *analysis.Pass, stmt ast.Stmt) bool {
+	expr, ok := stmt.(*ast.ExprStmt)
+	if !ok {
+		return false
+	}
+
+	ce, ok := expr.X.(*ast.CallExpr)
+	if !ok {
+		return false
+	}
+
+	return NewCallMeta(pass, ce) != nil
+}

internal/checkers/helpers_naming.go

@@ -5,11 +5,6 @@ import (
 	"regexp"
 )
 
-func isIdentNamedAsExpected(pattern *regexp.Regexp, e ast.Expr) bool {
-	id, ok := e.(*ast.Ident)
-	return ok && pattern.MatchString(id.Name)
-}
-
 func isStructVarNamedAsExpected(pattern *regexp.Regexp, e ast.Expr) bool {
 	s, ok := e.(*ast.SelectorExpr)
 	return ok && isIdentNamedAsExpected(pattern, s.X)
@@ -19,3 +14,8 @@ func isStructFieldNamedAsExpected(pattern *regexp.Regexp, e ast.Expr) bool {
 	s, ok := e.(*ast.SelectorExpr)
 	return ok && isIdentNamedAsExpected(pattern, s.Sel)
 }
+
+func isIdentNamedAsExpected(pattern *regexp.Regexp, e ast.Expr) bool {
+	id, ok := e.(*ast.Ident)
+	return ok && pattern.MatchString(id.Name)
+}

internal/checkers/suite_thelper.go

@@ -33,7 +33,7 @@ func (checker SuiteTHelper) Check(pass *analysis.Pass, inspector *inspector.Insp
 			return
 		}
 
-		if !containsAssertions(pass, fd) {
+		if !fnContainsAssertions(pass, fd) {
 			return
 		}
 
@@ -65,30 +65,3 @@ func (checker SuiteTHelper) Check(pass *analysis.Pass, inspector *inspector.Insp
 	})
 	return diagnostics
 }
-
-func containsAssertions(pass *analysis.Pass, fn *ast.FuncDecl) bool {
-	if fn.Body == nil {
-		return false
-	}
-
-	for _, s := range fn.Body.List {
-		if isAssertionStmt(pass, s) {
-			return true
-		}
-	}
-	return false
-}
-
-func isAssertionStmt(pass *analysis.Pass, stmt ast.Stmt) bool {
-	expr, ok := stmt.(*ast.ExprStmt)
-	if !ok {
-		return false
-	}
-
-	ce, ok := expr.X.(*ast.CallExpr)
-	if !ok {
-		return false
-	}
-
-	return NewCallMeta(pass, ce) != nil
-}