From f6ce931fcfc75c0fd8c873467711fcd02f420d89 Mon Sep 17 00:00:00 2001
From: Denis Isaev <denis@golangci.com>
Date: Sun, 20 Jan 2019 22:43:03 +0300
Subject: [PATCH] fix #355: don't merge megacheck on linters cmd

---
 pkg/commands/linters.go           | 2 +-
 pkg/commands/run.go               | 2 +-
 pkg/lint/lintersdb/enabled_set.go | 6 ++++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkg/commands/linters.go b/pkg/commands/linters.go
index 8bde5f58..84452201 100644
--- a/pkg/commands/linters.go
+++ b/pkg/commands/linters.go
@@ -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)
 	}
diff --git a/pkg/commands/run.go b/pkg/commands/run.go
index 67f8fe8b..407b0a4d 100644
--- a/pkg/commands/run.go
+++ b/pkg/commands/run.go
@@ -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
 	}
diff --git a/pkg/lint/lintersdb/enabled_set.go b/pkg/lint/lintersdb/enabled_set.go
index a5db6a9f..3799912f 100644
--- a/pkg/lint/lintersdb/enabled_set.go
+++ b/pkg/lint/lintersdb/enabled_set.go
@@ -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 {