Skip to content

Commit d766639

Browse files
committed
chore: use @LINTER instead of @
1 parent eff3ab1 commit d766639

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

.golangci.reference.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2881,7 +2881,7 @@ severity:
28812881
# - GitHub: https://help.github.com/en/actions/reference/workflow-commands-for-github-actions#setting-an-error-message
28822882
# - TeamCity: https://www.jetbrains.com/help/teamcity/service-messages.html#Inspection+Instance
28832883
#
2884-
# `@` can be used as severity value to keep the severity from linters (e.g. revive, gosec, ...)
2884+
# `@linter` can be used as severity value to keep the severity from linters (e.g. revive, gosec, ...)
28852885
#
28862886
# Default: ""
28872887
default-severity: error
@@ -2894,7 +2894,7 @@ severity:
28942894
# Severity rules have the same filtering capability as exclude rules
28952895
# except you are allowed to specify one matcher per severity rule.
28962896
#
2897-
# `@` can be used as severity value to keep the severity from linters (e.g. revive, gosec, ...)
2897+
# `@linter` can be used as severity value to keep the severity from linters (e.g. revive, gosec, ...)
28982898
#
28992899
# Only affects out formats that support setting severity information.
29002900
#

pkg/result/processors/severity.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ import (
88
"github.com/golangci/golangci-lint/pkg/result"
99
)
1010

11+
const severityFromLinter = "@linter"
12+
1113
var _ Processor = &Severity{}
1214

1315
type severityRule struct {
@@ -69,7 +71,7 @@ func (p *Severity) transform(issue *result.Issue) *result.Issue {
6971
rule := rule
7072

7173
if rule.match(issue, p.files, p.log) {
72-
if rule.severity == "@" || rule.severity == "" && p.defaultSeverity == "@" {
74+
if rule.severity == severityFromLinter || rule.severity == "" && p.defaultSeverity == severityFromLinter {
7375
return issue
7476
}
7577

@@ -82,7 +84,7 @@ func (p *Severity) transform(issue *result.Issue) *result.Issue {
8284
}
8385
}
8486

85-
if p.defaultSeverity != "@" {
87+
if p.defaultSeverity != severityFromLinter {
8688
issue.Severity = p.defaultSeverity
8789
}
8890

pkg/result/processors/severity_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ func TestSeverity_transform(t *testing.T) {
421421
Default: "error",
422422
Rules: []SeverityRule{
423423
{
424-
Severity: "@",
424+
Severity: severityFromLinter,
425425
BaseRule: BaseRule{
426426
Linters: []string{"linter1"},
427427
},
@@ -442,7 +442,7 @@ func TestSeverity_transform(t *testing.T) {
442442
{
443443
desc: "keep severity from linter as default",
444444
opts: SeverityOptions{
445-
Default: "@",
445+
Default: severityFromLinter,
446446
Rules: []SeverityRule{
447447
{
448448
Severity: "info",
@@ -466,7 +466,7 @@ func TestSeverity_transform(t *testing.T) {
466466
{
467467
desc: "keep severity from linter as default (without rule)",
468468
opts: SeverityOptions{
469-
Default: "@",
469+
Default: severityFromLinter,
470470
},
471471
issue: &result.Issue{
472472
Text: "This is a report",

0 commit comments

Comments
 (0)