fix #355: don't merge megacheck on linters cmd
This commit is contained in:
parent
2216387fa7
commit
f6ce931fcf
pkg
@ -35,7 +35,7 @@ func (e *Executor) executeLinters(_ *cobra.Command, args []string) {
|
||||
e.log.Fatalf("Usage: golangci-lint linters")
|
||||
}
|
||||
|
||||
enabledLCs, err := e.EnabledLintersSet.Get()
|
||||
enabledLCs, err := e.EnabledLintersSet.Get(false)
|
||||
if err != nil {
|
||||
log.Fatalf("Can't get enabled linters: %s", err)
|
||||
}
|
||||
|
@ -254,7 +254,7 @@ func fixSlicesFlags(fs *pflag.FlagSet) {
|
||||
func (e *Executor) runAnalysis(ctx context.Context, args []string) (<-chan result.Issue, error) {
|
||||
e.cfg.Run.Args = args
|
||||
|
||||
enabledLinters, err := e.EnabledLintersSet.Get()
|
||||
enabledLinters, err := e.EnabledLintersSet.Get(true)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
@ -115,14 +115,16 @@ func (es EnabledSet) optimizeLintersSet(linters map[string]*linter.Config) {
|
||||
}
|
||||
}
|
||||
|
||||
func (es EnabledSet) Get() ([]*linter.Config, error) {
|
||||
func (es EnabledSet) Get(optimize bool) ([]*linter.Config, error) {
|
||||
if err := es.v.validateEnabledDisabledLintersConfig(&es.cfg.Linters); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
resultLintersSet := es.build(&es.cfg.Linters, es.m.GetAllEnabledByDefaultLinters())
|
||||
es.verbosePrintLintersStatus(resultLintersSet)
|
||||
es.optimizeLintersSet(resultLintersSet)
|
||||
if optimize {
|
||||
es.optimizeLintersSet(resultLintersSet)
|
||||
}
|
||||
|
||||
var resultLinters []*linter.Config
|
||||
for _, lc := range resultLintersSet {
|
||||
|
Loading…
x
Reference in New Issue
Block a user