chore: migrate godox

Author: ldez

pkg/golinters/godox/godox.go

@@ -3,36 +3,22 @@ package godox
 import (
 	"go/token"
 	"strings"
-	"sync"
 
 	"github.com/matoous/godox"
 	"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/result"
 )
 
 const linterName = "godox"
 
 func New(settings *config.GodoxSettings) *goanalysis.Linter {
-	var mu sync.Mutex
-	var resIssues []goanalysis.Issue
-
 	analyzer := &analysis.Analyzer{
 		Name: linterName,
 		Doc:  goanalysis.TheOnlyanalyzerDoc,
 		Run: func(pass *analysis.Pass) (any, error) {
-			issues := runGodox(pass, settings)
-
-			if len(issues) == 0 {
-				return nil, nil
-			}
-
-			mu.Lock()
-			resIssues = append(resIssues, issues...)
-			mu.Unlock()
+			runGodox(pass, settings)
 
 			return nil, nil
 		},
@@ -43,33 +29,27 @@ func New(settings *config.GodoxSettings) *goanalysis.Linter {
 		"Tool for detection of FIXME, TODO and other comment keywords",
 		[]*analysis.Analyzer{analyzer},
 		nil,
-	).WithIssuesReporter(func(*linter.Context) []goanalysis.Issue {
-		return resIssues
-	}).WithLoadMode(goanalysis.LoadModeSyntax)
+	).WithLoadMode(goanalysis.LoadModeSyntax)
 }
 
-func runGodox(pass *analysis.Pass, settings *config.GodoxSettings) []goanalysis.Issue {
-	var messages []godox.Message
+func runGodox(pass *analysis.Pass, settings *config.GodoxSettings) {
 	for _, file := range pass.Files {
-		messages = append(messages, godox.Run(file, pass.Fset, settings.Keywords...)...)
-	}
+		position := goanalysis.GetFilePosition(pass, file)
 
-	if len(messages) == 0 {
-		return nil
-	}
+		messages := godox.Run(file, pass.Fset, settings.Keywords...)
+		if len(messages) == 0 {
+			continue
+		}
 
-	issues := make([]goanalysis.Issue, len(messages))
+		nonAdjPosition := pass.Fset.PositionFor(file.Pos(), false)
 
-	for k, i := range messages {
-		issues[k] = goanalysis.NewIssue(&result.Issue{
-			Pos: token.Position{
-				Filename: i.Pos.Filename,
-				Line:     i.Pos.Line,
-			},
-			Text:       strings.TrimRight(i.Message, "\n"),
-			FromLinter: linterName,
-		}, pass)
-	}
+		ft := pass.Fset.File(file.Pos())
 
-	return issues
+		for _, i := range messages {
+			pass.Report(analysis.Diagnostic{
+				Pos:     ft.LineStart(goanalysis.AdjustPos(i.Pos.Line, nonAdjPosition.Line, position.Line)) + token.Pos(i.Pos.Column),
+				Message: strings.TrimRight(i.Message, "\n"),
+			})
+		}
+	}
 }