Skip to content

Commit e42a8bc

Browse files
ldeztomMoulard
andcommitted
gci: remove the use of stdin
Co-authored-by: Tom Moulard <[email protected]>
1 parent a913b3e commit e42a8bc

File tree

2 files changed

+26
-2
lines changed

2 files changed

+26
-2
lines changed

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ require (
4444
github.com/gostaticanalysis/nilerr v0.1.1
4545
github.com/hashicorp/go-multierror v1.1.1
4646
github.com/hashicorp/go-version v1.6.0
47+
github.com/hexops/gotextdiff v1.0.3
4748
github.com/jgautheron/goconst v1.5.1
4849
github.com/jingyugao/rowserrcheck v1.1.1
4950
github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af
@@ -132,7 +133,6 @@ require (
132133
github.com/gostaticanalysis/comment v1.4.2 // indirect
133134
github.com/hashicorp/errwrap v1.0.0 // indirect
134135
github.com/hashicorp/hcl v1.0.0 // indirect
135-
github.com/hexops/gotextdiff v1.0.3 // indirect
136136
github.com/inconshreveable/mousetrap v1.0.0 // indirect
137137
github.com/kisielk/gotool v1.0.0 // indirect
138138
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect

pkg/golinters/gci.go

+25-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ import (
77

88
gcicfg "github.com/daixiang0/gci/pkg/config"
99
"github.com/daixiang0/gci/pkg/gci"
10+
"github.com/daixiang0/gci/pkg/io"
11+
"github.com/daixiang0/gci/pkg/log"
12+
"github.com/hexops/gotextdiff"
13+
"github.com/hexops/gotextdiff/myers"
14+
"github.com/hexops/gotextdiff/span"
1015
"github.com/pkg/errors"
1116
"golang.org/x/tools/go/analysis"
1217

@@ -81,7 +86,7 @@ func runGci(pass *analysis.Pass, lintCtx *linter.Context, cfg *gcicfg.Config, lo
8186
}
8287

8388
var diffs []string
84-
err := gci.DiffFormattedFilesToArray(fileNames, *cfg, &diffs, lock)
89+
err := diffFormattedFilesToArray(fileNames, *cfg, &diffs, lock)
8590
if err != nil {
8691
return nil, err
8792
}
@@ -106,6 +111,25 @@ func runGci(pass *analysis.Pass, lintCtx *linter.Context, cfg *gcicfg.Config, lo
106111
return issues, nil
107112
}
108113

114+
// diffFormattedFilesToArray is a copy of gci.DiffFormattedFilesToArray without io.StdInGenerator.
115+
// gci.DiffFormattedFilesToArray uses gci.processStdInAndGoFilesInPaths that uses io.StdInGenerator but stdin is not active on CI.
116+
// https://github.com/daixiang0/gci/blob/6f5cb16718ba07f0342a58de9b830ec5a6d58790/pkg/gci/gci.go#L63-L75
117+
// https://github.com/daixiang0/gci/blob/6f5cb16718ba07f0342a58de9b830ec5a6d58790/pkg/gci/gci.go#L80
118+
func diffFormattedFilesToArray(paths []string, cfg gcicfg.Config, diffs *[]string, lock *sync.Mutex) error {
119+
log.InitLogger()
120+
defer func() { _ = log.L().Sync() }()
121+
122+
return gci.ProcessFiles(io.GoFilesInPathsGenerator(paths), cfg, func(filePath string, unmodifiedFile, formattedFile []byte) error {
123+
fileURI := span.URIFromPath(filePath)
124+
edits := myers.ComputeEdits(fileURI, string(unmodifiedFile), string(formattedFile))
125+
unifiedEdits := gotextdiff.ToUnified(filePath, filePath, string(unmodifiedFile), edits)
126+
lock.Lock()
127+
*diffs = append(*diffs, fmt.Sprint(unifiedEdits))
128+
lock.Unlock()
129+
return nil
130+
})
131+
}
132+
109133
func getErrorTextForGci(settings config.GciSettings) string {
110134
text := "File is not `gci`-ed"
111135

0 commit comments

Comments
 (0)