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

Getting rid of code duplication

Browse Source 
Signed-off-by: Maciej "Iwan" Iwanowski <maciej.iwanowski@critical.today>
This commit is contained in:
Maciej "Iwan" Iwanowski 2020-04-23 18:37:40 +02:00
parent f8137cf2aa
commit 078f44f8aa
1 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pkg/result/processors/exclude_rules.go
View File

@ -37,24 +37,29 @@ func NewExcludeRules(rules []ExcludeRule, lineCache *fsutils.LineCache, log logu
lineCache: lineCache, lineCache: lineCache,
log: log, log: log,
} }
r.rules = createRules(rules, "(?i)")
return r
}
func createRules(rules []ExcludeRule, prefix string) []excludeRule {
parsedRules := make([]excludeRule, 0, len(rules))
for _, rule := range rules { for _, rule := range rules {
parsedRule := excludeRule{ parsedRule := excludeRule{
linters: rule.Linters, linters: rule.Linters,
} }
if rule.Text != "" { if rule.Text != "" {
parsedRule.text = regexp.MustCompile("(?i)" + rule.Text) parsedRule.text = regexp.MustCompile(prefix + rule.Text)
} }
if rule.Source != "" { if rule.Source != "" {
parsedRule.source = regexp.MustCompile("(?i)" + rule.Source) parsedRule.source = regexp.MustCompile(prefix + rule.Source)
} }
if rule.Path != "" { if rule.Path != "" {
parsedRule.path = regexp.MustCompile(rule.Path) parsedRule.path = regexp.MustCompile(rule.Path)
} }
r.rules = append(r.rules, parsedRule) parsedRules = append(parsedRules, parsedRule)
} }
return parsedRules
return r
} }
func (p ExcludeRules) Process(issues []result.Issue) ([]result.Issue, error) { func (p ExcludeRules) Process(issues []result.Issue) ([]result.Issue, error) {
@ -128,22 +133,7 @@ func NewExcludeRulesCaseSensitive(rules []ExcludeRule, lineCache *fsutils.LineCa
lineCache: lineCache, lineCache: lineCache,
log: log, log: log,
} }
r.rules = createRules(rules, "")
for _, rule := range rules {
parsedRule := excludeRule{
linters: rule.Linters,
}
if rule.Text != "" {
parsedRule.text = regexp.MustCompile(rule.Text)
}
if rule.Source != "" {
parsedRule.source = regexp.MustCompile(rule.Source)
}
if rule.Path != "" {
parsedRule.path = regexp.MustCompile(rule.Path)
}
r.rules = append(r.rules, parsedRule)
}
return &ExcludeRulesCaseSensitive{r} return &ExcludeRulesCaseSensitive{r}
} }