Skip to content

Commit 98cf596

Browse files
ldezldez
committed
fix: invert default for compatibility
1 parent d2116e4 commit 98cf596

8 files changed

+256
-11
lines changed

Diff for: ‎.golangci.next.reference.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -544,8 +544,8 @@ linters:
544544
# Default: 40
545545
statements: -1
546546
# Ignore comments when counting lines.
547-
# Default false
548-
ignore-comments: true
547+
# Default: true
548+
ignore-comments: false
549549

550550
ginkgolinter:
551551
# Suppress the wrong length assertion warning.

Diff for: ‎jsonschema/golangci.jsonschema.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1319,7 +1319,7 @@
13191319
"ignore-comments": {
13201320
"description": "Ignore comments when counting lines.",
13211321
"type": "boolean",
1322-
"default": false
1322+
"default": true
13231323
}
13241324
}
13251325
},

Diff for: ‎jsonschema/golangci.next.jsonschema.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1319,7 +1319,7 @@
13191319
"ignore-comments": {
13201320
"description": "Ignore comments when counting lines.",
13211321
"type": "boolean",
1322-
"default": false
1322+
"default": true
13231323
}
13241324
}
13251325
},

Diff for: ‎pkg/config/linters_settings.go

+3
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ var defaultLintersSettings = LintersSettings{
4141
Forbidigo: ForbidigoSettings{
4242
ExcludeGodocExamples: true,
4343
},
44+
Funlen: FunlenSettings{
45+
IgnoreComments: true,
46+
},
4447
GoChecksumType: GoChecksumTypeSettings{
4548
DefaultSignifiesExhaustive: true,
4649
},

Diff for: ‎pkg/golinters/funlen/testdata/funlen.go

+123-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,129 @@
11
//golangcitest:args -Efunlen
22
package testdata
33

4-
// want +1 "Function 'main' is too long"
5-
func main() {
4+
func TooManyLines() { // want `Function 'TooManyLines' is too long \(70 > 60\)`
5+
t := struct {
6+
A0 string
7+
A1 string
8+
A2 string
9+
A3 string
10+
A4 string
11+
A5 string
12+
A6 string
13+
A7 string
14+
A8 string
15+
A9 string
16+
A10 string
17+
A11 string
18+
A12 string
19+
A13 string
20+
A14 string
21+
A15 string
22+
A16 string
23+
A17 string
24+
A18 string
25+
A19 string
26+
A20 string
27+
A21 string
28+
A22 string
29+
A23 string
30+
A24 string
31+
A25 string
32+
A26 string
33+
A27 string
34+
A28 string
35+
A29 string
36+
A30 string
37+
A31 string
38+
A32 string
39+
}{
40+
A0: "a",
41+
A1: "a",
42+
A2: "a",
43+
A3: "a",
44+
A4: "a",
45+
A5: "a",
46+
A6: "a",
47+
A7: "a",
48+
A8: "a",
49+
A9: "a",
50+
A10: "a",
51+
A11: "a",
52+
A12: "a",
53+
A13: "a",
54+
A14: "a",
55+
A15: "a",
56+
A16: "a",
57+
A17: "a",
58+
A18: "a",
59+
A19: "a",
60+
A20: "a",
61+
A21: "a",
62+
A22: "a",
63+
A23: "a",
64+
A24: "a",
65+
A25: "a",
66+
A26: "a",
67+
A27: "a",
68+
A28: "a",
69+
A29: "a",
70+
A30: "a",
71+
A31: "a",
72+
A32: "a",
73+
}
74+
_ = t
75+
}
76+
77+
func TooManyStatements() { // want `Function 'TooManyStatements' has too many statements \(46 > 40\)`
78+
a0 := 1
79+
a1 := 1
80+
a2 := 1
81+
a3 := 1
82+
a4 := 1
83+
a5 := 1
84+
a6 := 1
85+
a7 := 1
86+
a8 := 1
87+
a9 := 1
88+
a10 := 1
89+
a11 := 1
90+
a12 := 1
91+
a13 := 1
92+
a14 := 1
93+
a15 := 1
94+
a16 := 1
95+
a17 := 1
96+
a18 := 1
97+
a19 := 1
98+
a20 := 1
99+
a21 := 1
100+
a22 := 1
101+
_ = a0
102+
_ = a1
103+
_ = a2
104+
_ = a3
105+
_ = a4
106+
_ = a5
107+
_ = a6
108+
_ = a7
109+
_ = a8
110+
_ = a9
111+
_ = a10
112+
_ = a11
113+
_ = a12
114+
_ = a13
115+
_ = a14
116+
_ = a15
117+
_ = a16
118+
_ = a17
119+
_ = a18
120+
_ = a19
121+
_ = a20
122+
_ = a21
123+
_ = a22
124+
}
125+
126+
func withComments() {
6127
// Comment 1
7128
// Comment 2
8129
// Comment 3

Diff for: ‎pkg/golinters/funlen/testdata/funlen_cgo.go

+123-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,129 @@ func _() {
2121
C.free(unsafe.Pointer(cs))
2222
}
2323

24-
// want +1 "Function 'main' is too long"
25-
func main() {
24+
func TooManyLines() { // want `Function 'TooManyLines' is too long \(70 > 60\)`
25+
t := struct {
26+
A0 string
27+
A1 string
28+
A2 string
29+
A3 string
30+
A4 string
31+
A5 string
32+
A6 string
33+
A7 string
34+
A8 string
35+
A9 string
36+
A10 string
37+
A11 string
38+
A12 string
39+
A13 string
40+
A14 string
41+
A15 string
42+
A16 string
43+
A17 string
44+
A18 string
45+
A19 string
46+
A20 string
47+
A21 string
48+
A22 string
49+
A23 string
50+
A24 string
51+
A25 string
52+
A26 string
53+
A27 string
54+
A28 string
55+
A29 string
56+
A30 string
57+
A31 string
58+
A32 string
59+
}{
60+
A0: "a",
61+
A1: "a",
62+
A2: "a",
63+
A3: "a",
64+
A4: "a",
65+
A5: "a",
66+
A6: "a",
67+
A7: "a",
68+
A8: "a",
69+
A9: "a",
70+
A10: "a",
71+
A11: "a",
72+
A12: "a",
73+
A13: "a",
74+
A14: "a",
75+
A15: "a",
76+
A16: "a",
77+
A17: "a",
78+
A18: "a",
79+
A19: "a",
80+
A20: "a",
81+
A21: "a",
82+
A22: "a",
83+
A23: "a",
84+
A24: "a",
85+
A25: "a",
86+
A26: "a",
87+
A27: "a",
88+
A28: "a",
89+
A29: "a",
90+
A30: "a",
91+
A31: "a",
92+
A32: "a",
93+
}
94+
_ = t
95+
}
96+
97+
func TooManyStatements() { // want `Function 'TooManyStatements' has too many statements \(46 > 40\)`
98+
a0 := 1
99+
a1 := 1
100+
a2 := 1
101+
a3 := 1
102+
a4 := 1
103+
a5 := 1
104+
a6 := 1
105+
a7 := 1
106+
a8 := 1
107+
a9 := 1
108+
a10 := 1
109+
a11 := 1
110+
a12 := 1
111+
a13 := 1
112+
a14 := 1
113+
a15 := 1
114+
a16 := 1
115+
a17 := 1
116+
a18 := 1
117+
a19 := 1
118+
a20 := 1
119+
a21 := 1
120+
a22 := 1
121+
_ = a0
122+
_ = a1
123+
_ = a2
124+
_ = a3
125+
_ = a4
126+
_ = a5
127+
_ = a6
128+
_ = a7
129+
_ = a8
130+
_ = a9
131+
_ = a10
132+
_ = a11
133+
_ = a12
134+
_ = a13
135+
_ = a14
136+
_ = a15
137+
_ = a16
138+
_ = a17
139+
_ = a18
140+
_ = a19
141+
_ = a20
142+
_ = a21
143+
_ = a22
144+
}
145+
146+
func withComments() {
26147
// Comment 1
27148
// Comment 2
28149
// Comment 3

Diff for: ‎pkg/golinters/funlen/testdata/funlen_ignore_comments.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
//golangcitest:args -Efunlen
22
//golangcitest:config_path testdata/funlen_ignore_comments.yml
3-
//golangcitest:expected_exitcode 0
43
package testdata
54

6-
func main() {
5+
// want +1 "Function 'withComments' is too long"
6+
func withComments() {
77
// Comment 1
88
// Comment 2
99
// Comment 3

Diff for: ‎pkg/golinters/funlen/testdata/funlen_ignore_comments.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ version: "2"
33
linters:
44
settings:
55
funlen:
6-
ignore-comments: true
6+
ignore-comments: false

0 commit comments

Comments
 (0)