Skip to content

Commit 9e73716

Browse files
committed
review: gofumpt first
1 parent 14b622c commit 9e73716

File tree

1 file changed

+3
-22
lines changed

1 file changed

+3
-22
lines changed

pkg/result/processors/formatter.go

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -38,30 +38,11 @@ func NewFormatter(log logutils.Log, cfg *config.Config, enabledLinters map[strin
3838
p.formatters = append(p.formatters, gofmt.New(cfg.LintersSettings.Gofmt))
3939
}
4040

41-
_, hasGoFumpt := enabledLinters[gofumpt.Name]
42-
_, hasGoImports := enabledLinters[goimports.Name]
43-
44-
switch {
45-
// "dynamic" order based on options.
46-
case hasGoFumpt && hasGoImports:
47-
// if gofumpt has "ModulePath", it will run after goimports.
48-
if cfg.LintersSettings.Gofumpt.ModulePath != "" {
49-
p.formatters = append(p.formatters,
50-
goimports.New(),
51-
gofumpt.New(cfg.LintersSettings.Gofumpt, cfg.Run.Go),
52-
)
53-
} else {
54-
// maybe goimports has "LocalPrefixes`, goimports will run after gofumpt.
55-
p.formatters = append(p.formatters,
56-
gofumpt.New(cfg.LintersSettings.Gofumpt, cfg.Run.Go),
57-
goimports.New(),
58-
)
59-
}
60-
61-
case hasGoFumpt:
41+
if _, ok := enabledLinters[gofumpt.Name]; ok {
6242
p.formatters = append(p.formatters, gofumpt.New(cfg.LintersSettings.Gofumpt, cfg.Run.Go))
43+
}
6344

64-
case hasGoImports:
45+
if _, ok := enabledLinters[goimports.Name]; ok {
6546
p.formatters = append(p.formatters, goimports.New())
6647
}
6748

0 commit comments

Comments
 (0)