Skip to content

Commit a750784

Browse files
committed
fix #355: don't merge megacheck on linters cmd
1 parent 2216387 commit a750784

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

pkg/commands/linters.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func (e *Executor) executeLinters(_ *cobra.Command, args []string) {
3535
e.log.Fatalf("Usage: golangci-lint linters")
3636
}
3737

38-
enabledLCs, err := e.EnabledLintersSet.Get()
38+
enabledLCs, err := e.EnabledLintersSet.Get(false)
3939
if err != nil {
4040
log.Fatalf("Can't get enabled linters: %s", err)
4141
}

pkg/commands/run.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ func fixSlicesFlags(fs *pflag.FlagSet) {
254254
func (e *Executor) runAnalysis(ctx context.Context, args []string) (<-chan result.Issue, error) {
255255
e.cfg.Run.Args = args
256256

257-
enabledLinters, err := e.EnabledLintersSet.Get()
257+
enabledLinters, err := e.EnabledLintersSet.Get(true)
258258
if err != nil {
259259
return nil, err
260260
}

pkg/lint/lintersdb/enabled_set.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,14 +115,16 @@ func (es EnabledSet) optimizeLintersSet(linters map[string]*linter.Config) {
115115
}
116116
}
117117

118-
func (es EnabledSet) Get() ([]*linter.Config, error) {
118+
func (es EnabledSet) Get(optimize bool) ([]*linter.Config, error) {
119119
if err := es.v.validateEnabledDisabledLintersConfig(&es.cfg.Linters); err != nil {
120120
return nil, err
121121
}
122122

123123
resultLintersSet := es.build(&es.cfg.Linters, es.m.GetAllEnabledByDefaultLinters())
124124
es.verbosePrintLintersStatus(resultLintersSet)
125-
es.optimizeLintersSet(resultLintersSet)
125+
if optimize {
126+
es.optimizeLintersSet(resultLintersSet)
127+
}
126128

127129
var resultLinters []*linter.Config
128130
for _, lc := range resultLintersSet {

0 commit comments

Comments
 (0)