Skip to content

Commit 6dafb0c

Browse files
committed
chore: bump golangci-lint to v2
1 parent ddec203 commit 6dafb0c

7 files changed

Lines changed: 128 additions & 109 deletions

File tree

‎.github/workflows/test.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Checkout code
1717
uses: actions/checkout@v3
1818
- name: Run lints
19-
uses: golangci/golangci-lint-action@v6
19+
uses: golangci/golangci-lint-action@v8
2020
with:
2121
version: latest
2222
if: "matrix.platform == 'ubuntu-latest'" # gofmt linter fails on Windows for CRLF problems

‎.golangci.yml‎

Lines changed: 108 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -1,102 +1,119 @@
1-
issues:
2-
exclude-use-default: false
3-
exclude-rules:
4-
- path: _test.go
5-
linters:
6-
- errcheck
7-
- lll
8-
exclude:
9-
- "Package util"
1+
version: "2"
2+
run:
3+
timeout: 10m
104

115
linters:
12-
disable-all: true
6+
default: none
137
enable:
148
- errcheck
15-
- gosimple
9+
- godot
1610
- govet
1711
- ineffassign
18-
- staticcheck
19-
- typecheck
20-
- unused
21-
- gofmt
22-
- godot
12+
- lll
2313
- makezero
2414
- misspell
2515
- revive
16+
- staticcheck
17+
- unused
2618
- wastedassign
27-
- lll
28-
29-
linters-settings:
30-
revive:
31-
severity: "warning"
32-
confidence: 0.8
19+
settings:
20+
staticcheck:
21+
checks:
22+
- all
23+
- -QF*
24+
- -ST*
25+
revive:
26+
confidence: 0.8
27+
severity: warning
28+
rules:
29+
- name: blank-imports
30+
severity: warning
31+
disabled: false
32+
- name: context-as-argument
33+
severity: warning
34+
disabled: false
35+
- name: context-keys-type
36+
severity: warning
37+
disabled: false
38+
- name: dot-imports
39+
severity: warning
40+
disabled: true
41+
- name: error-return
42+
severity: warning
43+
disabled: false
44+
- name: error-strings
45+
severity: warning
46+
disabled: false
47+
- name: error-naming
48+
severity: warning
49+
disabled: false
50+
- name: exported
51+
severity: warning
52+
disabled: false
53+
- name: increment-decrement
54+
severity: warning
55+
disabled: false
56+
- name: var-naming
57+
severity: warning
58+
disabled: false
59+
- name: var-declaration
60+
severity: warning
61+
disabled: false
62+
- name: package-comments
63+
severity: warning
64+
disabled: false
65+
- name: range
66+
severity: warning
67+
disabled: false
68+
- name: receiver-naming
69+
severity: warning
70+
disabled: false
71+
- name: time-naming
72+
severity: warning
73+
disabled: false
74+
- name: unexported-return
75+
severity: warning
76+
disabled: false
77+
- name: indent-error-flow
78+
severity: warning
79+
disabled: false
80+
- name: errorf
81+
severity: warning
82+
disabled: false
83+
- name: empty-block
84+
severity: warning
85+
disabled: true
86+
- name: superfluous-else
87+
severity: warning
88+
disabled: false
89+
- name: unused-parameter
90+
severity: warning
91+
disabled: true
92+
- name: unreachable-code
93+
severity: warning
94+
disabled: false
95+
- name: redefines-builtin-id
96+
severity: warning
97+
exclusions:
98+
generated: lax
3399
rules:
34-
- name: blank-imports
35-
severity: warning
36-
disabled: false
37-
- name: context-as-argument
38-
severity: warning
39-
disabled: false
40-
- name: context-keys-type
41-
severity: warning
42-
disabled: false
43-
- name: dot-imports
44-
severity: warning
45-
disabled: true
46-
- name: error-return
47-
severity: warning
48-
disabled: false
49-
- name: error-strings
50-
severity: warning
51-
disabled: false
52-
- name: error-naming
53-
severity: warning
54-
disabled: false
55-
- name: exported
56-
severity: warning
57-
disabled: false
58-
- name: increment-decrement
59-
severity: warning
60-
disabled: false
61-
- name: var-naming
62-
severity: warning
63-
disabled: false
64-
- name: var-declaration
65-
severity: warning
66-
disabled: false
67-
- name: package-comments
68-
severity: warning
69-
disabled: false
70-
- name: range
71-
severity: warning
72-
disabled: false
73-
- name: receiver-naming
74-
severity: warning
75-
disabled: false
76-
- name: time-naming
77-
severity: warning
78-
disabled: false
79-
- name: unexported-return
80-
severity: warning
81-
disabled: false
82-
- name: indent-error-flow
83-
severity: warning
84-
disabled: false
85-
- name: errorf
86-
severity: warning
87-
disabled: false
88-
- name: empty-block
89-
severity: warning
90-
disabled: true
91-
- name: superfluous-else
92-
severity: warning
93-
disabled: false
94-
- name: unused-parameter
95-
severity: warning
96-
disabled: true
97-
- name: unreachable-code
98-
severity: warning
99-
disabled: false
100-
- name: redefines-builtin-id
101-
severity: warning
102-
disabled: false
100+
- linters:
101+
- errcheck
102+
- lll
103+
- unused
104+
path: _test.go
105+
paths:
106+
- third_party$
107+
- builtin$
108+
- examples$
109+
110+
formatters:
111+
enable:
112+
- gofmt
113+
- goimports
114+
exclusions:
115+
generated: lax
116+
paths:
117+
- third_party$
118+
- builtin$
119+
- examples$

‎extension/footnote.go‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ func (b *footnoteBlockParser) Open(parent gast.Node, reader text.Reader, pc pars
4848
}
4949
open := pos + 1
5050
var closes int
51-
closure := util.FindClosure(line[pos+1:min(len(line), pos+1+footnoteLabelLimit)], '[', ']', false, false) //nolint:staticcheck
51+
labelBytes := line[pos+1 : min(len(line), pos+1+footnoteLabelLimit)]
52+
closure := util.FindClosure(labelBytes, '[', ']', false, false) //nolint:staticcheck
5253
closes = pos + 1 + closure
5354
next := closes + 1
5455
if closure > -1 {
@@ -139,7 +140,8 @@ func (s *footnoteParser) Parse(parent gast.Node, block text.Reader, pc parser.Co
139140
return nil
140141
}
141142
open := pos
142-
closure := util.FindClosure(line[pos:min(len(line), pos+footnoteLabelLimit)], '[', ']', false, false) //nolint:staticcheck
143+
labelBytes := line[pos:min(len(line), pos+footnoteLabelLimit)]
144+
closure := util.FindClosure(labelBytes, '[', ']', false, false) //nolint:staticcheck
143145
if closure < 0 {
144146
return nil
145147
}

‎extension/linkify.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import (
1111
"github.com/yuin/goldmark/util"
1212
)
1313

14-
var wwwURLRegxp = regexp.MustCompile(`^www\.[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-z]+(?:[/#?][-a-zA-Z0-9@:%_\+.~#!?&/=\(\);,'">\^{}\[\]` + "`" + `]*)?`) //nolint:golint,lll
14+
var wwwURLRegxp = regexp.MustCompile(`^www\.[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-z]+(?:[/#?][-a-zA-Z0-9@:%_\+.~#!?&/=\(\);,'">\^{}\[\]` + "`" + `]*)?`) //nolint:lll
1515

16-
var urlRegexp = regexp.MustCompile(`^(?:http|https|ftp)://[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-z]+(?::\d+)?(?:[/#?][-a-zA-Z0-9@:%_+.~#$!?&/=\(\);,'">\^{}\[\]` + "`" + `]*)?`) //nolint:golint,lll
16+
var urlRegexp = regexp.MustCompile(`^(?:http|https|ftp)://[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-z]+(?::\d+)?(?:[/#?][-a-zA-Z0-9@:%_+.~#$!?&/=\(\);,'">\^{}\[\]` + "`" + `]*)?`) //nolint:lll
1717

1818
// An LinkifyConfig struct is a data structure that holds configuration of the
1919
// Linkify extension.

‎parser/html_block.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ var allowedBlockTags = map[string]bool{
7676
"ul": true,
7777
}
7878

79-
var htmlBlockType1OpenRegexp = regexp.MustCompile(`(?i)^[ ]{0,3}<(script|pre|style|textarea)(?:\s.*|>.*|/>.*|)(?:\r\n|\n)?$`) //nolint:golint,lll
79+
var htmlBlockType1OpenRegexp = regexp.MustCompile(`(?i)^[ ]{0,3}<(script|pre|style|textarea)(?:\s.*|>.*|/>.*|)(?:\r\n|\n)?$`) //nolint:lll
8080
var htmlBlockType1CloseRegexp = regexp.MustCompile(`(?i)^.*</(?:script|pre|style|textarea)>.*`)
8181

8282
var htmlBlockType2OpenRegexp = regexp.MustCompile(`^[ ]{0,3}<!\-\-`)
@@ -91,9 +91,9 @@ var htmlBlockType4Close = []byte{'>'}
9191
var htmlBlockType5OpenRegexp = regexp.MustCompile(`^[ ]{0,3}<\!\[CDATA\[`)
9292
var htmlBlockType5Close = []byte{']', ']', '>'}
9393

94-
var htmlBlockType6Regexp = regexp.MustCompile(`^[ ]{0,3}<(?:/[ ]*)?([a-zA-Z]+[a-zA-Z0-9\-]*)(?:[ ].*|>.*|/>.*|)(?:\r\n|\n)?$`) //nolint:golint,lll
94+
var htmlBlockType6Regexp = regexp.MustCompile(`^[ ]{0,3}<(?:/[ ]*)?([a-zA-Z]+[a-zA-Z0-9\-]*)(?:[ ].*|>.*|/>.*|)(?:\r\n|\n)?$`) //nolint:lll
9595

96-
var htmlBlockType7Regexp = regexp.MustCompile(`^[ ]{0,3}<(/[ ]*)?([a-zA-Z]+[a-zA-Z0-9\-]*)(` + attributePattern + `*)[ ]*(?:>|/>)[ ]*(?:\r\n|\n)?$`) //nolint:golint,lll
96+
var htmlBlockType7Regexp = regexp.MustCompile(`^[ ]{0,3}<(/[ ]*)?([a-zA-Z]+[a-zA-Z0-9\-]*)(` + attributePattern + `*)[ ]*(?:>|/>)[ ]*(?:\r\n|\n)?$`) //nolint:lll
9797

9898
type htmlBlockParser struct {
9999
}

‎parser/raw_html.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ var closeCommentCacheKey = NewContextKey()
5454

5555
var tagnamePattern = `([A-Za-z][A-Za-z0-9-]*)`
5656
var spaceOrOneNewline = `(?:[ \t]|(?:\r\n|\n){0,1})`
57-
var attributePattern = `(?:[\r\n \t]+[a-zA-Z_:][a-zA-Z0-9:._-]*(?:[\r\n \t]*=[\r\n \t]*(?:[^\"'=<>` + "`" + `\x00-\x20]+|'[^']*'|"[^"]*"))?)` //nolint:golint,lll
57+
var attributePattern = `(?:[\r\n \t]+[a-zA-Z_:][a-zA-Z0-9:._-]*(?:[\r\n \t]*=[\r\n \t]*(?:[^\"'=<>` + "`" + `\x00-\x20]+|'[^']*'|"[^"]*"))?)` //nolint:lll
5858
var openTagRegexp = regexp.MustCompile("^<" + tagnamePattern + attributePattern + `*` + spaceOrOneNewline + `*/?>`)
5959
var closeTagRegexp = regexp.MustCompile("^</" + tagnamePattern + spaceOrOneNewline + `*>`)
6060

@@ -89,7 +89,7 @@ func (s *rawHTMLParser) parseComment(block text.Reader, pc Context) ast.Node {
8989
}
9090
offset := len(openComment)
9191
line = line[offset:]
92-
lastStop := segment.Stop
92+
var lastStop int
9393
for {
9494
index := bytes.Index(line, closeComment)
9595
if index > -1 {

0 commit comments

Comments
 (0)