fixes: support assert.CollectT (#233)

Author: Antonboom

analyzer/analyzer_test.go

@@ -76,6 +76,10 @@ func TestTestifyLint_NotDefaultCases(t *testing.T) {
 			dir:   "error-as-target",
 			flags: map[string]string{"disable-all": "true", "enable": checkers.NewErrorIsAs().Name()},
 		},
+		{
+			dir:   "error-is-as-issue231",
+			flags: map[string]string{"enable-all": "true"},
+		},
 		{
 			dir:   "error-nil-issue95",
 			flags: map[string]string{"disable-all": "true", "enable": checkers.NewErrorNil().Name()},

analyzer/testdata/src/error-is-as-issue231/assert_collect_test.go

@@ -0,0 +1,28 @@
+package errorisasissue231
+
+import (
+	"fmt"
+	"strconv"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestEventuallyAsserts(t *testing.T) {
+	require.EventuallyWithT(t,
+		func(c *assert.CollectT) {
+			_, err := strconv.Atoi("a")
+			if err != nil {
+				c.Errorf("failed: %v", err)
+
+				c.Errorf(fmt.Sprintf("failed: %v", err)) // want "formatter: remove unnecessary fmt\\.Sprintf"
+				c.Errorf("failed: %v")                   // want "formatter: c\\.Errorf format %v reads arg #1, but call has 0 args"
+				return
+			}
+		},
+		time.Second,
+		time.Millisecond,
+	)
+}

analyzer/testdata/src/error-is-as-issue231/assert_collect_test.go.golden

@@ -0,0 +1,28 @@
+package errorisasissue231
+
+import (
+	"fmt"
+	"strconv"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestEventuallyAsserts(t *testing.T) {
+	require.EventuallyWithT(t,
+		func(c *assert.CollectT) {
+			_, err := strconv.Atoi("a")
+			if err != nil {
+				c.Errorf("failed: %v", err)
+
+				c.Errorf("failed: %v", err) // want "formatter: remove unnecessary fmt\\.Sprintf"
+				c.Errorf("failed: %v")                   // want "formatter: c\\.Errorf format %v reads arg #1, but call has 0 args"
+				return
+			}
+		},
+		time.Second,
+		time.Millisecond,
+	)
+}

internal/checkers/error_is_as.go

@@ -6,6 +6,9 @@ import (
 	"go/types"
 
 	"golang.org/x/tools/go/analysis"
+
+	"github.com/Antonboom/testifylint/internal/analysisutil"
+	"github.com/Antonboom/testifylint/internal/testify"
 )
 
 // ErrorIsAs detects situations like
@@ -34,7 +37,7 @@ func (ErrorIsAs) Name() string { return "error-is-as" }
 func (checker ErrorIsAs) Check(pass *analysis.Pass, call *CallMeta) *analysis.Diagnostic {
 	switch call.Fn.NameFTrimmed {
 	case "Error":
-		if len(call.Args) >= 2 && isError(pass, call.Args[1]) {
+		if len(call.Args) >= 2 && isError(pass, call.Args[1]) && !isAssertCollectT(pass, call.Selector.X) {
 			const proposed = "ErrorIs"
 			msg := fmt.Sprintf("invalid usage of %[1]s.Error, use %[1]s.%[2]s instead", call.SelectorXStr, proposed)
 			return newDiagnostic(checker.Name(), call, msg, newSuggestedFuncReplacement(call, proposed))
@@ -146,3 +149,18 @@ func (checker ErrorIsAs) Check(pass *analysis.Pass, call *CallMeta) *analysis.Di
 	}
 	return nil
 }
+
+func isAssertCollectT(pass *analysis.Pass, e ast.Expr) bool {
+	ptr, ok := pass.TypesInfo.TypeOf(e).(*types.Pointer)
+	if !ok {
+		return false
+	}
+
+	named, ok := ptr.Elem().(*types.Named)
+	if !ok {
+		return false
+	}
+
+	collectT := analysisutil.ObjectOf(pass.Pkg, testify.AssertPkgPath, "CollectT")
+	return named.Obj() == collectT
+}

internal/checkers/formatter.go

@@ -259,7 +259,8 @@ func getMsgPosition(sig *types.Signature) int {
 	for i := 0; i < sig.Params().Len(); i++ {
 		param := sig.Params().At(i)
 
-		if b, ok := param.Type().(*types.Basic); ok && b.Kind() == types.String && param.Name() == "msg" {
+		if b, ok := param.Type().(*types.Basic); ok && b.Kind() == types.String && (param.Name() == "msg" ||
+			param.Name() == "format") { // NOTE(a.telyshev): assert.CollectT case.
 			return i
 		}
 	}