eeafj/golangci-lint
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

fix #355: don't merge megacheck on linters cmd

Browse Source
This commit is contained in:
Denis Isaev 2019-01-20 22:43:03 +03:00 committed by Isaev Denis
parent 2216387fa7
commit f6ce931fcf
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/commands/linters.go
View File

@ -35,7 +35,7 @@ func (e *Executor) executeLinters(_ *cobra.Command, args []string) {
e.log.Fatalf("Usage: golangci-lint linters") e.log.Fatalf("Usage: golangci-lint linters")
} }
enabledLCs, err := e.EnabledLintersSet.Get() enabledLCs, err := e.EnabledLintersSet.Get(false)
if err != nil { if err != nil {
log.Fatalf("Can't get enabled linters: %s", err) log.Fatalf("Can't get enabled linters: %s", err)
} }

2
pkg/commands/run.go
View File

@ -254,7 +254,7 @@ func fixSlicesFlags(fs *pflag.FlagSet) {
func (e *Executor) runAnalysis(ctx context.Context, args []string) (<-chan result.Issue, error) { func (e *Executor) runAnalysis(ctx context.Context, args []string) (<-chan result.Issue, error) {
e.cfg.Run.Args = args e.cfg.Run.Args = args
enabledLinters, err := e.EnabledLintersSet.Get() enabledLinters, err := e.EnabledLintersSet.Get(true)
if err != nil { if err != nil {
return nil, err return nil, err
} }

4
pkg/lint/lintersdb/enabled_set.go
View File

@ -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 { if err := es.v.validateEnabledDisabledLintersConfig(&es.cfg.Linters); err != nil {
return nil, err return nil, err
} }
resultLintersSet := es.build(&es.cfg.Linters, es.m.GetAllEnabledByDefaultLinters()) resultLintersSet := es.build(&es.cfg.Linters, es.m.GetAllEnabledByDefaultLinters())
es.verbosePrintLintersStatus(resultLintersSet) es.verbosePrintLintersStatus(resultLintersSet)
if optimize {
es.optimizeLintersSet(resultLintersSet) es.optimizeLintersSet(resultLintersSet)
}
var resultLinters []*linter.Config var resultLinters []*linter.Config
for _, lc := range resultLintersSet { for _, lc := range resultLintersSet {