fix: read files from disk

golangci · Dec 24, 2024 · 636293c · 636293c
1 parent 27ba895
commit 636293c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/pkg/lint/runner.go b/pkg/lint/runner.go
@@ -60,7 +60,7 @@ func NewRunner(log logutils.Log, cfg *config.Config, args []string, goenv *gouti
 		return nil, fmt.Errorf("failed to get enabled linters: %w", err)
 	}
 
-	formatter, err := processors.NewFormatter(log, cfg, fileCache, enabledLinters)
+	formatter, err := processors.NewFormatter(log, cfg, enabledLinters)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create formatter: %w", err)
 	}
@@ -100,7 +100,7 @@ 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),
-			// The fommatter needs to be after the fixer and the last processor that use fileCache.
+			// The formatter needs to be after the fixer and the last processor that write files.
 			formatter,
 
 			// Now we can modify the issues for output.

diff --git a/pkg/result/processors/formatter.go b/pkg/result/processors/formatter.go
@@ -7,7 +7,6 @@ import (
 	"slices"
 
 	"github.com/golangci/golangci-lint/pkg/config"
-	"github.com/golangci/golangci-lint/pkg/fsutils"
 	"github.com/golangci/golangci-lint/pkg/goformatters"
 	"github.com/golangci/golangci-lint/pkg/goformatters/gci"
 	"github.com/golangci/golangci-lint/pkg/goformatters/gofmt"
@@ -21,17 +20,14 @@ import (
 type Formatter struct {
 	log        logutils.Log
 	cfg        *config.Config
-	fileCache  *fsutils.FileCache
 	formatters []goformatters.Formatter
 }
 
 func NewFormatter(log logutils.Log, cfg *config.Config,
-	fileCache *fsutils.FileCache,
 	enabledLinters map[string]*linter.Config) (*Formatter, error) {
 	p := &Formatter{
-		log:       log,
-		cfg:       cfg,
-		fileCache: fileCache,
+		log: log,
+		cfg: cfg,
 	}
 
 	if _, ok := enabledLinters[gofmt.Name]; ok {
@@ -108,7 +104,7 @@ func (p *Formatter) Process(issues []result.Issue) ([]result.Issue, error) {
 	}
 
 	for target := range files {
-		content, err := p.fileCache.GetFileBytes(target)
+		content, err := os.ReadFile(target)
 		if err != nil {
 			p.log.Warnf("Error reading file %s: %v", target, err)
 			continue