feat: remove typecheck display as active linter

golangci · Jun 28, 2023 · becee2f · becee2f
1 parent 96b9dae
commit becee2f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/pkg/lint/lintersdb/enabled_set.go b/pkg/lint/lintersdb/enabled_set.go
@@ -144,8 +144,8 @@ func (es EnabledSet) GetOptimizedLinters() ([]*linter.Config, error) {
 func (es EnabledSet) combineGoAnalysisLinters(linters map[string]*linter.Config) {
 	var goanalysisLinters []*goanalysis.Linter
 	goanalysisPresets := map[string]bool{}
-	for _, linter := range linters {
-		lnt, ok := linter.Linter.(*goanalysis.Linter)
+	for _, lc := range linters {
+		lnt, ok := lc.Linter.(*goanalysis.Linter)
 		if !ok {
 			continue
 		}
@@ -154,7 +154,7 @@ func (es EnabledSet) combineGoAnalysisLinters(linters map[string]*linter.Config)
 			continue
 		}
 		goanalysisLinters = append(goanalysisLinters, lnt)
-		for _, p := range linter.InPresets {
+		for _, p := range lc.InPresets {
 			goanalysisPresets[p] = true
 		}
 	}
@@ -207,6 +207,10 @@ func (es EnabledSet) combineGoAnalysisLinters(linters map[string]*linter.Config)
 func (es EnabledSet) verbosePrintLintersStatus(lcs map[string]*linter.Config) {
 	var linterNames []string
 	for _, lc := range lcs {
+		if lc.Internal {
+			continue
+		}
+
 		linterNames = append(linterNames, lc.Name())
 	}
 	sort.StringSlice(linterNames).Sort()

diff --git a/pkg/result/processors/nolint_test.go b/pkg/result/processors/nolint_test.go
@@ -279,11 +279,15 @@ func TestNolintUnused(t *testing.T) {
 	createProcessor := func(t *testing.T, log *logutils.MockLog, enabledLinters []string) *Nolint {
 		enabledSetLog := logutils.NewMockLog()
 		enabledSetLog.On("Infof", "Active %d linters: %s", len(enabledLinters), enabledLinters)
+
 		cfg := &config.Config{Linters: config.Linters{DisableAll: true, Enable: enabledLinters}}
 		dbManager := lintersdb.NewManager(cfg, nil)
+
 		enabledLintersSet := lintersdb.NewEnabledSet(dbManager, lintersdb.NewValidator(dbManager), enabledSetLog, cfg)
+
 		enabledLintersMap, err := enabledLintersSet.GetEnabledLintersMap()
 		assert.NoError(t, err)
+
 		return NewNolint(log, dbManager, enabledLintersMap)
 	}
 
@@ -310,21 +314,21 @@ func TestNolintUnused(t *testing.T) {
 	}
 
 	t.Run("when an issue does not occur, it is not removed from the nolintlint issues", func(t *testing.T) {
-		p := createProcessor(t, log, []string{"nolintlint", "typecheck", "varcheck"})
+		p := createProcessor(t, log, []string{"nolintlint", "varcheck"})
 		defer p.Finish()
 
 		processAssertSame(t, p, nolintlintIssueVarcheck)
 	})
 
 	t.Run("when an issue does not occur but nolintlint is nolinted, it is removed from the nolintlint issues", func(t *testing.T) {
-		p := createProcessor(t, log, []string{"nolintlint", "typecheck", "varcheck"})
+		p := createProcessor(t, log, []string{"nolintlint", "varcheck"})
 		defer p.Finish()
 
 		processAssertEmpty(t, p, nolintlintIssueVarcheckUnusedOK)
 	})
 
 	t.Run("when an issue occurs, it is removed from the nolintlint issues", func(t *testing.T) {
-		p := createProcessor(t, log, []string{"nolintlint", "typecheck", "varcheck"})
+		p := createProcessor(t, log, []string{"nolintlint", "varcheck"})
 		defer p.Finish()
 
 		processAssertEmpty(t, p, []result.Issue{{
@@ -338,7 +342,7 @@ func TestNolintUnused(t *testing.T) {
 
 	t.Run("when a linter is not enabled, it is removed from the nolintlint unused issues", func(t *testing.T) {
 		enabledSetLog := logutils.NewMockLog()
-		enabledSetLog.On("Infof", "Active %d linters: %s", 2, []string{"nolintlint", "typecheck"})
+		enabledSetLog.On("Infof", "Active %d linters: %s", 1, []string{"nolintlint"})
 
 		cfg := &config.Config{Linters: config.Linters{DisableAll: true, Enable: []string{"nolintlint"}}}
 		dbManager := lintersdb.NewManager(cfg, nil)

diff --git a/test/enabled_linters_test.go b/test/enabled_linters_test.go
@@ -170,6 +170,10 @@ func getEnabledByDefaultLinters() []string {
 	ebdl := lintersdb.NewManager(nil, nil).GetAllEnabledByDefaultLinters()
 	var ret []string
 	for _, lc := range ebdl {
+		if lc.Internal {
+			continue
+		}
+
 		ret = append(ret, lc.Name())
 	}