formatter: support non-string single arg (#200)

Author: Antonboom

analyzer/testdata/src/checkers-default/blank-import/blank_import_test.go

@@ -363,6 +363,7 @@ func TestFormatterChecker_AllAssertions(t *testing.T) {
 }
 
 func TestFormatterChecker_Ignored(t *testing.T) {
+	assert.Equal(nil, nil, new(time.Time))
 	assert.ObjectsAreEqual(nil, nil)
 	assert.ObjectsAreEqualValues(nil, nil)
 	assert.ObjectsExportedFieldsAreEqual(nil, nil)

analyzer/testdata/src/checkers-default/formatter/formatter_test.go

@@ -0,0 +1,19 @@
+package debug
+
+import (
+	"net/http"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestFormatter(t *testing.T) {
+	assert.False(t, true)
+	assert.False(t, true, new(http.Response))
+	// assert.False(t, true, new(http.Response), 1, 2, 3) // panic
+	assert.False(t, true, "hello")
+	assert.False(t, true, "hello", 1, 2)
+	assert.False(t, true, "hello_%v_%d", 3, 4)
+	assert.Falsef(t, true, "world")
+	assert.Falsef(t, true, "world_%d_%v", 5, 6)
+}

analyzer/testdata/src/checkers-default/formatter/formatter_test.go.golden

@@ -15,6 +15,7 @@ func TestFormatterChecker(t *testing.T) {
 	var args []any
 	assert.Errorf(t, err, "Parse(%v) should fail.", args) // want "formatter: use assert\\.Errorf$"
 	assert.Equal(t, 1, 2)
+	assert.Equal(t, 1, 2, new(time.Time))
 	assert.Equalf(t, 1, 2, "msg")                           // want "formatter: use assert\\.Equalf"
 	assert.Equalf(t, 1, 2, "msg with arg %d", 42)           // want "formatter: use assert\\.Equalf"
 	assert.Equalf(t, 1, 2, "msg with args %d %s", 42, "42") // want "formatter: use assert\\.Equalf"

analyzer/testdata/src/checkers-default/suite-dont-use-pkg/suite_dont_use_pkg_test.go

@@ -115,15 +115,19 @@ func (checker Formatter) checkFmtAssertion(pass *analysis.Pass, call *CallMeta)
 
 func isPrintfLikeCall(pass *analysis.Pass, call *CallMeta) (int, bool) {
 	msgAndArgsPos := getMsgAndArgsPosition(call.Fn.Signature)
-	if msgAndArgsPos < 0 {
+	if msgAndArgsPos <= 0 {
+		return -1, false
+	}
+
+	if !(len(call.ArgsRaw) > msgAndArgsPos && hasStringType(pass, call.ArgsRaw[msgAndArgsPos])) {
 		return -1, false
 	}
 
 	if !assertHasFormattedAnalogue(pass, call) {
 		return -1, false
 	}
 
-	return msgAndArgsPos, len(call.ArgsRaw) > msgAndArgsPos
+	return msgAndArgsPos, true
 }
 
 func assertHasFormattedAnalogue(pass *analysis.Pass, call *CallMeta) bool {

analyzer/testdata/src/debug/formatter_test.go

@@ -114,6 +114,7 @@ func (g FormatterTestsGenerator) TemplateData() any {
 		SprintfAssertions: sprintfAssertions,
 		AllAssertions:     assertions,
 		IgnoredAssertions: []Assertion{
+			{Fn: "Equal", Argsf: "nil, nil, new(time.Time)"},
 			{Fn: "ObjectsAreEqual", Argsf: "nil, nil"},
 			{Fn: "ObjectsAreEqualValues", Argsf: "nil, nil"},
 			{Fn: "ObjectsExportedFieldsAreEqual", Argsf: "nil, nil"},

analyzer/testdata/src/formatter-not-defaults/formatter_not_defaults_test.go

@@ -19,6 +19,8 @@ func (g FormatterNotDefaultsTestsGenerator) TemplateData() any {
 
 	baseAssertions := []Assertion{
 		{Fn: "Equal", Argsf: "1, 2"},
+		{Fn: "Equal", Argsf: "1, 2, new(time.Time)"},
+		// {Fn: "Equal", Argsf: "1, 2, new(time.Time), 2"}, // Panics.
 		{Fn: "Equal", Argsf: `1, 2, "msg"`, ReportMsgf: reportUse, ProposedFn: "Equalf"},
 		{Fn: "Equal", Argsf: `1, 2, "msg with arg %d", 42`, ReportMsgf: reportUse, ProposedFn: "Equalf"},
 		{Fn: "Equal", Argsf: `1, 2, "msg with args %d %s", 42, "42"`, ReportMsgf: reportUse, ProposedFn: "Equalf"},