fix: filter Go filenames (#5291)

Author: ldez

pkg/goanalysis/position.go

@@ -8,10 +8,6 @@ import (
 	"golang.org/x/tools/go/analysis"
 )
 
-func GetFilePosition(pass *analysis.Pass, f *ast.File) token.Position {
-	return GetFilePositionFor(pass.Fset, f.Pos())
-}
-
 func GetGoFilePosition(pass *analysis.Pass, f *ast.File) (token.Position, bool) {
 	position := GetFilePositionFor(pass.Fset, f.Pos())
 

pkg/golinters/dupl/dupl.go

@@ -3,7 +3,6 @@ package dupl
 import (
 	"fmt"
 	"go/token"
-	"strings"
 	"sync"
 
 	duplAPI "github.com/golangci/dupl"
@@ -55,19 +54,7 @@ func New(settings *config.DuplSettings) *goanalysis.Linter {
 }
 
 func runDupl(pass *analysis.Pass, settings *config.DuplSettings) ([]goanalysis.Issue, error) {
-	fileNames := internal.GetFileNames(pass)
-
-	var onlyGofiles []string
-	for _, name := range fileNames {
-		// Related to Windows
-		if !strings.HasSuffix(name, ".go") {
-			continue
-		}
-
-		onlyGofiles = append(onlyGofiles, name)
-	}
-
-	issues, err := duplAPI.Run(onlyGofiles, settings.Threshold)
+	issues, err := duplAPI.Run(internal.GetGoFileNames(pass), settings.Threshold)
 	if err != nil {
 		return nil, err
 	}

pkg/golinters/gomodguard/gomodguard.go

@@ -73,7 +73,7 @@ func New(settings *config.GoModGuardSettings) *goanalysis.Linter {
 		}
 
 		analyzer.Run = func(pass *analysis.Pass) (any, error) {
-			gomodguardIssues := processor.ProcessFiles(internal.GetFileNames(pass))
+			gomodguardIssues := processor.ProcessFiles(internal.GetGoFileNames(pass))
 
 			mu.Lock()
 			defer mu.Unlock()

pkg/golinters/internal/util.go

@@ -18,10 +18,17 @@ func FormatCode(code string, _ *config.Config) string {
 	return fmt.Sprintf("`%s`", code)
 }
 
-func GetFileNames(pass *analysis.Pass) []string {
+func GetGoFileNames(pass *analysis.Pass) []string {
 	var filenames []string
+
 	for _, f := range pass.Files {
-		filenames = append(filenames, goanalysis.GetFilePosition(pass, f).Filename)
+		position, b := goanalysis.GetGoFilePosition(pass, f)
+		if !b {
+			continue
+		}
+
+		filenames = append(filenames, position.Filename)
 	}
+
 	return filenames
 }

pkg/golinters/revive/revive.go

@@ -115,7 +115,7 @@ func newWrapper(settings *config.ReviveSettings) (*wrapper, error) {
 }
 
 func (w *wrapper) run(lintCtx *linter.Context, pass *analysis.Pass) ([]goanalysis.Issue, error) {
-	packages := [][]string{internal.GetFileNames(pass)}
+	packages := [][]string{internal.GetGoFileNames(pass)}
 
 	failures, err := w.revive.Lint(packages, w.lintingRules, *w.conf)
 	if err != nil {
@@ -184,17 +184,16 @@ func toIssue(pass *analysis.Pass, object *jsonObject) goanalysis.Issue {
 	if object.ReplacementLine != "" {
 		f := pass.Fset.File(token.Pos(object.Position.Start.Offset))
 
-		start := f.LineStart(object.Position.Start.Line)
-
-		end := goanalysis.EndOfLinePos(f, object.Position.End.Line)
-
-		issue.SuggestedFixes = []analysis.SuggestedFix{{
-			TextEdits: []analysis.TextEdit{{
-				Pos:     start,
-				End:     end,
-				NewText: []byte(object.ReplacementLine),
-			}},
-		}}
+		// Skip cgo files because the positions are wrong.
+		if object.GetFilename() == f.Name() {
+			issue.SuggestedFixes = []analysis.SuggestedFix{{
+				TextEdits: []analysis.TextEdit{{
+					Pos:     f.LineStart(object.Position.Start.Line),
+					End:     goanalysis.EndOfLinePos(f, object.Position.End.Line),
+					NewText: []byte(object.ReplacementLine),
+				}},
+			}}
+		}
 	}
 
 	return goanalysis.NewIssue(issue, pass)

pkg/golinters/revive/revive_integration_test.go

@@ -9,3 +9,11 @@ import (
 func TestFromTestdata(t *testing.T) {
 	integration.RunTestdata(t)
 }
+
+func TestFix(t *testing.T) {
+	integration.RunFix(t)
+}
+
+func TestFixPathPrefix(t *testing.T) {
+	integration.RunFixPathPrefix(t)
+}

pkg/golinters/revive/testdata/fix/in/revive.go

@@ -0,0 +1,14 @@
+//golangcitest:args -Erevive
+//golangcitest:config_path testdata/revive-fix.yml
+//golangcitest:expected_exitcode 0
+package in
+
+import (
+	"errors"
+	"fmt"
+	"math"
+)
+
+func _() error {
+	return errors.New(fmt.Sprintf("foo: %d", math.MaxInt))
+}

pkg/golinters/revive/testdata/fix/out/revive.go

@@ -0,0 +1,14 @@
+//golangcitest:args -Erevive
+//golangcitest:config_path testdata/revive-fix.yml
+//golangcitest:expected_exitcode 0
+package in
+
+import (
+	"errors"
+	"fmt"
+	"math"
+)
+
+func _() error {
+	return fmt.Errorf("foo: %d", math.MaxInt)
+}

pkg/golinters/revive/testdata/revive-fix.yml

@@ -0,0 +1,7 @@
+linters-settings:
+  revive:
+    ignore-generated-header: true
+    severity: warning
+    rules:
+      - name: errorf
+      - name: range