refactor: replace Exclude processor by ExclusionRules processor

Author: ldez

pkg/lint/runner.go

@@ -102,9 +102,8 @@ func NewRunner(log logutils.Log, cfg *config.Config, args []string, goenv *gouti
 			// Must be before exclude because users see already marked output and configure excluding by it.
 			processors.NewIdentifierMarker(),
 
-			processors.NewExclude(&cfg.Issues),
 			processors.NewExclusionRules(log.Child(logutils.DebugKeyExclusionRules), files,
-				&cfg.Linters.LinterExclusions, cfg.Issues.IncludeDefaultExcludes, cfg.Issues.ExcludeCaseSensitive),
+				&cfg.Linters.LinterExclusions, &cfg.Issues),
 
 			processors.NewNolintFilter(log.Child(logutils.DebugKeyNolintFilter), dbManager, enabledLinters),
 

pkg/result/processors/exclude.go

@@ -54,26 +54,41 @@ type ExclusionRules struct {
 	rules []excludeRule
 }
 
-func NewExclusionRules(log logutils.Log, files *fsutils.Files, cfg *config.LinterExclusions,
-	refs []string, caseSensitive bool) *ExclusionRules {
+func NewExclusionRules(log logutils.Log, files *fsutils.Files, cfg *config.LinterExclusions, oldCfg *config.Issues) *ExclusionRules {
 	p := &ExclusionRules{
 		log:            log,
 		files:          files,
 		warnUnused:     cfg.WarnUnused,
 		skippedCounter: map[string]int{},
 	}
 
-	excludeRules := slices.Clone(cfg.Rules)
-	excludeRules = append(excludeRules, filterInclude(getDefaultLintersExclusions(cfg.Default), refs)...)
-
 	// TODO(ldez) remove prefix in v2: the matching must be case sensitive, users can add `(?i)` inside the patterns if needed.
 	prefix := caseInsensitivePrefix
-	if caseSensitive {
+	if oldCfg.ExcludeCaseSensitive {
 		prefix = ""
 	}
 
+	excludeRules := slices.Clone(cfg.Rules)
+	excludeRules = append(excludeRules, filterInclude(getDefaultLintersExclusions(cfg.Default), oldCfg.IncludeDefaultExcludes)...)
+
 	p.rules = createRules(excludeRules, prefix)
 
+	// TODO(ldez): should be remove in v2.
+	for _, pattern := range oldCfg.ExcludePatterns {
+		if pattern == "" {
+			continue
+		}
+
+		rule := createRule(&config.ExcludeRule{
+			BaseRule: config.BaseRule{
+				Path: `.+\.go`,
+				Text: pattern,
+			},
+		}, prefix)
+
+		p.rules = append(p.rules, rule)
+	}
+
 	for _, rule := range p.rules {
 		if rule.internalReference == "" {
 			p.skippedCounter[rule.String()] = 0
@@ -121,33 +136,41 @@ func (p *ExclusionRules) Finish() {
 }
 
 func createRules(rules []config.ExcludeRule, prefix string) []excludeRule {
+	if len(rules) == 0 {
+		return nil
+	}
+
 	parsedRules := make([]excludeRule, 0, len(rules))
 
 	for _, rule := range rules {
-		parsedRule := excludeRule{}
-		parsedRule.linters = rule.Linters
-		parsedRule.internalReference = rule.InternalReference
+		parsedRules = append(parsedRules, createRule(&rule, prefix))
+	}
 
-		if rule.Text != "" {
-			parsedRule.text = regexp.MustCompile(prefix + rule.Text)
-		}
+	return parsedRules
+}
 
-		if rule.Source != "" {
-			parsedRule.source = regexp.MustCompile(prefix + rule.Source)
-		}
+func createRule(rule *config.ExcludeRule, prefix string) excludeRule {
+	parsedRule := excludeRule{}
+	parsedRule.linters = rule.Linters
+	parsedRule.internalReference = rule.InternalReference
 
-		if rule.Path != "" {
-			parsedRule.path = regexp.MustCompile(fsutils.NormalizePathInRegex(rule.Path))
-		}
+	if rule.Text != "" {
+		parsedRule.text = regexp.MustCompile(prefix + rule.Text)
+	}
 
-		if rule.PathExcept != "" {
-			parsedRule.pathExcept = regexp.MustCompile(fsutils.NormalizePathInRegex(rule.PathExcept))
-		}
+	if rule.Source != "" {
+		parsedRule.source = regexp.MustCompile(prefix + rule.Source)
+	}
 
-		parsedRules = append(parsedRules, parsedRule)
+	if rule.Path != "" {
+		parsedRule.path = regexp.MustCompile(fsutils.NormalizePathInRegex(rule.Path))
 	}
 
-	return parsedRules
+	if rule.PathExcept != "" {
+		parsedRule.pathExcept = regexp.MustCompile(fsutils.NormalizePathInRegex(rule.PathExcept))
+	}
+
+	return parsedRule
 }
 
 // TODO(ldez): must be removed in v2, only for compatibility with exclude-use-default/include.

pkg/result/processors/exclude_test.go

@@ -50,7 +50,7 @@ func TestExclusionRules_Process_multiple(t *testing.T) {
 		},
 	}
 
-	p := NewExclusionRules(nil, files, cfg, nil, false)
+	p := NewExclusionRules(nil, files, cfg, &config.Issues{})
 
 	cases := []issueTestCase{
 		{Path: "e.go", Text: "exclude", Linter: "linter"},
@@ -104,7 +104,7 @@ func TestExclusionRules_Process_pathPrefix(t *testing.T) {
 		},
 	}
 
-	p := NewExclusionRules(nil, files, cfg, nil, false)
+	p := NewExclusionRules(nil, files, cfg, &config.Issues{})
 
 	cases := []issueTestCase{
 		{Path: "e.go"},
@@ -147,7 +147,7 @@ func TestExclusionRules_Process_text(t *testing.T) {
 		}},
 	}
 
-	p := NewExclusionRules(nil, files, cfg, nil, false)
+	p := NewExclusionRules(nil, files, cfg, &config.Issues{})
 
 	texts := []string{"excLude", "1", "", "exclud", "notexclude"}
 	var issues []result.Issue
@@ -172,7 +172,7 @@ func TestExclusionRules_Process_text(t *testing.T) {
 func TestExclusionRules_Process_empty(t *testing.T) {
 	files := fsutils.NewFiles(fsutils.NewLineCache(fsutils.NewFileCache()), "")
 
-	p := NewExclusionRules(nil, files, &config.LinterExclusions{}, nil, false)
+	p := NewExclusionRules(nil, files, &config.LinterExclusions{}, &config.Issues{})
 
 	processAssertSame(t, p, newIssueFromTextTestCase("test"))
 }
@@ -209,7 +209,7 @@ func TestExclusionRules_Process_caseSensitive_multiple(t *testing.T) {
 		},
 	}
 
-	p := NewExclusionRules(nil, files, cfg, nil, true)
+	p := NewExclusionRules(nil, files, cfg, &config.Issues{ExcludeCaseSensitive: true})
 
 	cases := []issueTestCase{
 		{Path: "e.go", Text: "exclude", Linter: "linter"},
@@ -266,7 +266,7 @@ func TestExclusionRules_Process_caseSensitive_text(t *testing.T) {
 		},
 	}
 
-	p := NewExclusionRules(nil, files, cfg, nil, true)
+	p := NewExclusionRules(nil, files, cfg, &config.Issues{ExcludeCaseSensitive: true})
 
 	texts := []string{"exclude", "excLude", "1", "", "exclud", "notexclude"}
 
@@ -292,7 +292,7 @@ func TestExclusionRules_Process_caseSensitive_text(t *testing.T) {
 func TestExclusionRules_Process_caseSensitive_empty(t *testing.T) {
 	files := fsutils.NewFiles(fsutils.NewLineCache(fsutils.NewFileCache()), "")
 
-	p := NewExclusionRules(nil, files, &config.LinterExclusions{}, nil, true)
+	p := NewExclusionRules(nil, files, &config.LinterExclusions{}, &config.Issues{ExcludeCaseSensitive: true})
 
 	processAssertSame(t, p, newIssueFromTextTestCase("test"))
 }