feat: merge formatter and fixer processors

Author: ldez

pkg/lint/runner.go

@@ -66,11 +66,6 @@ func NewRunner(log logutils.Log, cfg *config.Config, args []string, goenv *gouti
 		return nil, fmt.Errorf("failed to create meta-formatter: %w", err)
 	}
 
-	formatter, err := processors.NewFormatter(log, cfg, metaFormatter)
-	if err != nil {
-		return nil, fmt.Errorf("failed to create formatter: %w", err)
-	}
-
 	return &Runner{
 		Processors: []processors.Processor{
 			processors.NewCgo(goenv),
@@ -106,8 +101,6 @@ func NewRunner(log logutils.Log, cfg *config.Config, args []string, goenv *gouti
 
 			// The fixer still needs to see paths for the issues that are relative to the current directory.
 			processors.NewFixer(cfg, log, fileCache, metaFormatter),
-			// The formatter needs to be after the fixer and the last processor that write files.
-			formatter,
 
 			// Now we can modify the issues for output.
 			processors.NewPathPrefixer(cfg.Output.PathPrefix),

pkg/result/processors/fixer.go

@@ -80,12 +80,13 @@ func (p Fixer) process(issues []result.Issue) ([]result.Issue, error) {
 	formatters := []string{gofumpt.Name, goimports.Name, gofmt.Name, gci.Name}
 
 	var notFixableIssues []result.Issue
+	var formatIssues []result.Issue
 
 	for i := range issues {
 		issue := issues[i]
 
 		if slices.Contains(formatters, issue.FromLinter) {
-			notFixableIssues = append(notFixableIssues, issue)
+			formatIssues = append(formatIssues, issue)
 			continue
 		}
 
@@ -175,6 +176,8 @@ func (p Fixer) process(issues []result.Issue) ([]result.Issue, error) {
 
 	var editError error
 
+	var formattedFiles []string
+
 	// Now we've got a set of valid edits for each file. Apply them.
 	for path, edits := range editsByPath {
 		contents, err := p.fileCache.GetFileBytes(path)
@@ -196,6 +199,28 @@ func (p Fixer) process(issues []result.Issue) ([]result.Issue, error) {
 			editError = errors.Join(editError, fmt.Errorf("%s: %w", path, err))
 			continue
 		}
+
+		formattedFiles = append(formattedFiles, path)
+	}
+
+	for i := range formatIssues {
+		path := issues[i].FilePath()
+
+		// Skips files already formatted by the previous fix step.
+		if slices.Contains(formattedFiles, path) {
+			content, err := p.fileCache.GetFileBytes(path)
+			if err != nil {
+				p.log.Warnf("Error reading file %s: %v", path, err)
+				continue
+			}
+
+			out := p.formatter.Format(path, content)
+
+			if err := os.WriteFile(path, out, filePerm); err != nil {
+				editError = errors.Join(editError, fmt.Errorf("%s: %w", path, err))
+				continue
+			}
+		}
 	}
 
 	return notFixableIssues, editError