diff --git a/pkg/golinters/gci/internal/analyzer.go b/pkg/golinters/gci/internal/analyzer.go index 3ace35d43195..9e34ddfea017 100644 --- a/pkg/golinters/gci/internal/analyzer.go +++ b/pkg/golinters/gci/internal/analyzer.go @@ -108,7 +108,7 @@ func runAnalysis(pass *analysis.Pass) (any, error) { pass.Report(analysis.Diagnostic{ Pos: fix.TextEdits[0].Pos, - Message: "Invalid import order", + Message: "File is not properly formatted", SuggestedFixes: []analysis.SuggestedFix{*fix}, }) } diff --git a/pkg/golinters/gci/testdata/gci.go b/pkg/golinters/gci/testdata/gci.go index 5b9a908e5d2d..27d533812250 100644 --- a/pkg/golinters/gci/testdata/gci.go +++ b/pkg/golinters/gci/testdata/gci.go @@ -2,7 +2,7 @@ //golangcitest:config_path testdata/gci.yml package testdata -// want +1 "Invalid import order" +// want +1 "File is not properly formatted" import ( "golang.org/x/tools/go/analysis" "github.com/golangci/golangci-lint/pkg/config" diff --git a/pkg/golinters/gci/testdata/gci_cgo.go b/pkg/golinters/gci/testdata/gci_cgo.go index 15a1735832f6..c526c0b5753d 100644 --- a/pkg/golinters/gci/testdata/gci_cgo.go +++ b/pkg/golinters/gci/testdata/gci_cgo.go @@ -16,7 +16,7 @@ package testdata */ import "C" -// want +1 "Invalid import order" +// want +1 "File is not properly formatted" import ( "golang.org/x/tools/go/analysis" "github.com/golangci/golangci-lint/pkg/config" diff --git a/pkg/golinters/gofmt/gofmt.go b/pkg/golinters/gofmt/gofmt.go index 24e827f6875c..57627fa07094 100644 --- a/pkg/golinters/gofmt/gofmt.go +++ b/pkg/golinters/gofmt/gofmt.go @@ -56,7 +56,7 @@ func runGofmt(lintCtx *linter.Context, pass *analysis.Pass, settings *config.GoF continue } - err = internal.ExtractDiagnosticFromPatch(pass, file, string(diff), lintCtx, getIssuedTextGoFmt) + err = internal.ExtractDiagnosticFromPatch(pass, file, string(diff), lintCtx) if err != nil { return fmt.Errorf("can't extract issues from gofmt diff output %q: %w", string(diff), err) } @@ -64,15 +64,3 @@ func runGofmt(lintCtx *linter.Context, pass *analysis.Pass, settings *config.GoF return nil } - -func getIssuedTextGoFmt(settings *config.LintersSettings) string { - text := "File is not `gofmt`-ed" - if settings.Gofmt.Simplify { - text += " with `-s`" - } - for _, rule := range settings.Gofmt.RewriteRules { - text += fmt.Sprintf(" `-r '%s -> %s'`", rule.Pattern, rule.Replacement) - } - - return text -} diff --git a/pkg/golinters/gofmt/testdata/gofmt.go b/pkg/golinters/gofmt/testdata/gofmt.go index 877d9017e08b..51caf7998424 100644 --- a/pkg/golinters/gofmt/testdata/gofmt.go +++ b/pkg/golinters/gofmt/testdata/gofmt.go @@ -5,5 +5,5 @@ import "fmt" func GofmtNotSimplified() { var x []string - fmt.Print(x[1:len(x)]) // want "File is not `gofmt`-ed with `-s`" + fmt.Print(x[1:len(x)]) // want "File is not properly formatted" } diff --git a/pkg/golinters/gofmt/testdata/gofmt_cgo.go b/pkg/golinters/gofmt/testdata/gofmt_cgo.go index 9effc9f5a9d5..fc623634d0bb 100644 --- a/pkg/golinters/gofmt/testdata/gofmt_cgo.go +++ b/pkg/golinters/gofmt/testdata/gofmt_cgo.go @@ -24,5 +24,5 @@ func _() { func GofmtNotSimplified() { var x []string - fmt.Print(x[1:len(x)]) // want "File is not `gofmt`-ed with `-s`" + fmt.Print(x[1:len(x)]) // want "File is not properly formatted" } diff --git a/pkg/golinters/gofmt/testdata/gofmt_no_simplify.go b/pkg/golinters/gofmt/testdata/gofmt_no_simplify.go index 5d1de6167ce4..3c3fb0a7a6e5 100644 --- a/pkg/golinters/gofmt/testdata/gofmt_no_simplify.go +++ b/pkg/golinters/gofmt/testdata/gofmt_no_simplify.go @@ -9,5 +9,5 @@ func GofmtNotSimplifiedOk() { fmt.Print(x[1:len(x)]) } -func GofmtBadFormat(){ // want "^File is not `gofmt`-ed" +func GofmtBadFormat(){ // want "File is not properly formatted" } diff --git a/pkg/golinters/gofmt/testdata/gofmt_rewrite_rules.go b/pkg/golinters/gofmt/testdata/gofmt_rewrite_rules.go index f2877a99747e..ae802398471d 100644 --- a/pkg/golinters/gofmt/testdata/gofmt_rewrite_rules.go +++ b/pkg/golinters/gofmt/testdata/gofmt_rewrite_rules.go @@ -11,7 +11,7 @@ func GofmtRewriteRule() { vals = append(vals, 2) vals = append(vals, 3) - slice := vals[1:len(vals)] // want "^File is not `gofmt`-ed" + slice := vals[1:len(vals)] // want "File is not properly formatted" fmt.Println(slice) } diff --git a/pkg/golinters/gofumpt/gofumpt.go b/pkg/golinters/gofumpt/gofumpt.go index 93b77298970a..a941a35f7e17 100644 --- a/pkg/golinters/gofumpt/gofumpt.go +++ b/pkg/golinters/gofumpt/gofumpt.go @@ -83,7 +83,7 @@ func runGofumpt(lintCtx *linter.Context, pass *analysis.Pass, diff differ, optio diff := out.String() - err = internal.ExtractDiagnosticFromPatch(pass, file, diff, lintCtx, getIssuedTextGoFumpt) + err = internal.ExtractDiagnosticFromPatch(pass, file, diff, lintCtx) if err != nil { return fmt.Errorf("can't extract issues from gofumpt diff output %q: %w", diff, err) } @@ -101,13 +101,3 @@ func getLangVersion(settings *config.GofumptSettings) string { return "go" + strings.TrimPrefix(settings.LangVersion, "go") } - -func getIssuedTextGoFumpt(settings *config.LintersSettings) string { - text := "File is not `gofumpt`-ed" - - if settings.Gofumpt.ExtraRules { - text += " with `-extra`" - } - - return text -} diff --git a/pkg/golinters/gofumpt/testdata/gofumpt.go b/pkg/golinters/gofumpt/testdata/gofumpt.go index 73528d2195fa..c72700cecbcf 100644 --- a/pkg/golinters/gofumpt/testdata/gofumpt.go +++ b/pkg/golinters/gofumpt/testdata/gofumpt.go @@ -4,5 +4,5 @@ package testdata import "fmt" func GofumptNewLine() { - fmt.Println( "foo" ) // want "File is not `gofumpt`-ed" + fmt.Println( "foo" ) // want "File is not properly formatted" } diff --git a/pkg/golinters/gofumpt/testdata/gofumpt_cgo.go b/pkg/golinters/gofumpt/testdata/gofumpt_cgo.go index 22baf8fb45ca..57223fd58056 100644 --- a/pkg/golinters/gofumpt/testdata/gofumpt_cgo.go +++ b/pkg/golinters/gofumpt/testdata/gofumpt_cgo.go @@ -23,5 +23,5 @@ func _() { } func GofumptNewLine() { - fmt.Println( "foo" ) // want "File is not `gofumpt`-ed" + fmt.Println( "foo" ) // want "File is not properly formatted" } diff --git a/pkg/golinters/gofumpt/testdata/gofumpt_with_extra.go b/pkg/golinters/gofumpt/testdata/gofumpt_with_extra.go index 6f01ba7e0fb7..3be0f5123cab 100644 --- a/pkg/golinters/gofumpt/testdata/gofumpt_with_extra.go +++ b/pkg/golinters/gofumpt/testdata/gofumpt_with_extra.go @@ -4,6 +4,6 @@ package testdata import "fmt" -func GofmtNotExtra(bar string, baz string) { // want "File is not `gofumpt`-ed with `-extra`" +func GofmtNotExtra(bar string, baz string) { // want "File is not properly formatted" fmt.Print("foo") } diff --git a/pkg/golinters/goimports/goimports.go b/pkg/golinters/goimports/goimports.go index 54029d49fc26..add4182c0be8 100644 --- a/pkg/golinters/goimports/goimports.go +++ b/pkg/golinters/goimports/goimports.go @@ -54,7 +54,7 @@ func runGoImports(lintCtx *linter.Context, pass *analysis.Pass) error { continue } - err = internal.ExtractDiagnosticFromPatch(pass, file, string(diff), lintCtx, getIssuedTextGoImports) + err = internal.ExtractDiagnosticFromPatch(pass, file, string(diff), lintCtx) if err != nil { return fmt.Errorf("can't extract issues from gofmt diff output %q: %w", string(diff), err) } @@ -62,13 +62,3 @@ func runGoImports(lintCtx *linter.Context, pass *analysis.Pass) error { return nil } - -func getIssuedTextGoImports(settings *config.LintersSettings) string { - text := "File is not `goimports`-ed" - - if settings.Goimports.LocalPrefixes != "" { - text += " with -local " + settings.Goimports.LocalPrefixes - } - - return text -} diff --git a/pkg/golinters/goimports/testdata/goimports.go b/pkg/golinters/goimports/testdata/goimports.go index 63f657c044c2..8bda09edbb8b 100644 --- a/pkg/golinters/goimports/testdata/goimports.go +++ b/pkg/golinters/goimports/testdata/goimports.go @@ -2,7 +2,7 @@ package testdata import ( - "fmt" // want "File is not `goimports`-ed" + "fmt" // want "File is not properly formatted" "github.com/golangci/golangci-lint/pkg/config" ) diff --git a/pkg/golinters/goimports/testdata/goimports_cgo.go b/pkg/golinters/goimports/testdata/goimports_cgo.go index 380ae1061e76..ffbf3eb7aab2 100644 --- a/pkg/golinters/goimports/testdata/goimports_cgo.go +++ b/pkg/golinters/goimports/testdata/goimports_cgo.go @@ -13,7 +13,7 @@ import "C" import ( "fmt" - "unsafe" // want "File is not `goimports`-ed" + "unsafe" // want "File is not properly formatted" "github.com/golangci/golangci-lint/pkg/config" ) diff --git a/pkg/golinters/goimports/testdata/goimports_local.go b/pkg/golinters/goimports/testdata/goimports_local.go index 3e330e9c850f..9207fb48d4ae 100644 --- a/pkg/golinters/goimports/testdata/goimports_local.go +++ b/pkg/golinters/goimports/testdata/goimports_local.go @@ -5,7 +5,7 @@ package testdata import ( "fmt" - "github.com/golangci/golangci-lint/pkg/config" // want "File is not `goimports`-ed with -local github.com/golangci/golangci-lint" + "github.com/golangci/golangci-lint/pkg/config" // want "File is not properly formatted" "golang.org/x/tools/go/analysis" ) diff --git a/pkg/golinters/internal/diff.go b/pkg/golinters/internal/diff.go index c9630de0cb7d..458763a018e4 100644 --- a/pkg/golinters/internal/diff.go +++ b/pkg/golinters/internal/diff.go @@ -11,7 +11,6 @@ import ( diffpkg "github.com/sourcegraph/go-diff/diff" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" "github.com/golangci/golangci-lint/pkg/goanalysis" "github.com/golangci/golangci-lint/pkg/lint/linter" "github.com/golangci/golangci-lint/pkg/logutils" @@ -30,8 +29,6 @@ const ( diffLineDeleted diffLineType = "deleted" ) -type fmtTextFormatter func(settings *config.LintersSettings) string - type diffLine struct { originalNumber int // 1-based original line number typ diffLineType @@ -219,7 +216,6 @@ func ExtractDiagnosticFromPatch( file *ast.File, patch string, lintCtx *linter.Context, - formatter fmtTextFormatter, ) error { diffs, err := diffpkg.ParseMultiFileDiff([]byte(patch)) if err != nil { @@ -246,7 +242,7 @@ func ExtractDiagnosticFromPatch( changes := p.parse(hunk) for _, change := range changes { - pass.Report(toDiagnostic(ft, change, formatter(lintCtx.Settings()), adjLine)) + pass.Report(toDiagnostic(ft, change, adjLine)) } } } @@ -254,7 +250,7 @@ func ExtractDiagnosticFromPatch( return nil } -func toDiagnostic(ft *token.File, change Change, message string, adjLine int) analysis.Diagnostic { +func toDiagnostic(ft *token.File, change Change, adjLine int) analysis.Diagnostic { start := ft.LineStart(change.From + adjLine) end := goanalysis.EndOfLinePos(ft, change.To+adjLine) @@ -262,7 +258,7 @@ func toDiagnostic(ft *token.File, change Change, message string, adjLine int) an return analysis.Diagnostic{ Pos: start, End: end, - Message: message, // TODO(ldez) change message formatter to have a better message. + Message: "File is not properly formatted", SuggestedFixes: []analysis.SuggestedFix{{ TextEdits: []analysis.TextEdit{{ Pos: start, diff --git a/test/run_test.go b/test/run_test.go index 883e1e5df79a..d6493dd41538 100644 --- a/test/run_test.go +++ b/test/run_test.go @@ -133,7 +133,7 @@ func TestCgoWithIssues(t *testing.T) { desc: "gofmt", args: []string{"--no-config", "--disable-all", "-Egofmt"}, dir: "cgo_with_issues", - expected: "File is not `gofmt`-ed with `-s` (gofmt)", + expected: "File is not properly formatted (gofmt)", }, { desc: "revive", @@ -186,7 +186,7 @@ func TestLineDirective(t *testing.T) { "--disable-all", }, targetPath: "linedirective", - expected: "File is not `gofmt`-ed with `-s` (gofmt)", + expected: "File is not properly formatted (gofmt)", }, { desc: "goimports", @@ -195,7 +195,7 @@ func TestLineDirective(t *testing.T) { "--disable-all", }, targetPath: "linedirective", - expected: "File is not `goimports`-ed (goimports)", + expected: "File is not properly formatted (goimports)", }, { desc: "gomodguard",