Skip to content

Commit 4edb83d

Browse files
committed
fix: directive format regression
Restores previous directive regexp expectations. Related to mvdan#327 Fixes mvdan#331
1 parent e350b3c commit 4edb83d

File tree

2 files changed

+117
-8
lines changed

2 files changed

+117
-8
lines changed

format/format.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -327,14 +327,14 @@ func (f *fumpter) lineEnd(line int) token.Pos {
327327
var rxCommentDirective = regexp.MustCompile(
328328
`^(?:` +
329329
`[a-z-]+:[a-z]+` +
330-
`|export` +
331-
`|extern` +
332-
`|line` +
333-
`|no(?:inspection|lint)` +
334-
`|#nosec` +
335-
`|NOSONAR` +
336-
`|sys(?:nb)?` +
337-
`)\b`)
330+
`|export\b` +
331+
`|extern\b` +
332+
`|line\b` +
333+
`|no(?:inspection|lint)\b` +
334+
`|#nosec\b` +
335+
`|NOSONAR\b` +
336+
`|sys(?:nb)?\b` +
337+
`)`)
338338

339339
func (f *fumpter) applyPre(c *astutil.Cursor) {
340340
f.splitLongLine(c)

testdata/script/directives.txtar

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,109 @@
1+
exec gofumpt -w foo.go
2+
cmp foo.go foo.go.golden
3+
4+
-- foo.go --
5+
package main
6+
7+
//foo:bar_one
8+
//foo:bar-two
9+
//foo:bar01
10+
//foo:barOne
11+
//foo:barTwo
12+
func main() {
13+
//foo:bar_one
14+
//foo:bar-two
15+
//foo:bar01
16+
//foo:barOne
17+
//foo:barTwo
18+
}
19+
20+
//foo: bar_one
21+
func a() {
22+
//foo: bar_one
23+
}
24+
25+
//foo: bar_one
26+
//foo:bar
27+
func b() {
28+
//foo: bar_one
29+
//foo:bar
30+
}
31+
32+
//noinspection
33+
func c() {
34+
//noinspection
35+
}
36+
37+
//nolint
38+
func d() {
39+
//nolint
40+
}
41+
42+
//#nosec
43+
func e() {
44+
//#nosec
45+
}
46+
47+
//NOSONAR
48+
func f() {
49+
//NOSONAR
50+
}
51+
52+
//foo
53+
func h() {
54+
//foo
55+
}
56+
57+
-- foo.go.golden --
58+
package main
59+
60+
//foo:bar_one
61+
//foo:bar-two
62+
//foo:bar01
63+
//foo:barOne
64+
//foo:barTwo
65+
func main() {
66+
//foo:bar_one
67+
//foo:bar-two
68+
//foo:bar01
69+
//foo:barOne
70+
//foo:barTwo
71+
}
72+
73+
// foo: bar_one
74+
func a() {
75+
// foo: bar_one
76+
}
77+
78+
// foo: bar_one
79+
//
80+
//foo:bar
81+
func b() {
82+
//foo: bar_one
83+
//foo:bar
84+
}
85+
86+
// noinspection
87+
func c() {
88+
//noinspection
89+
}
90+
91+
// nolint
92+
func d() {
93+
//nolint
94+
}
95+
96+
// #nosec
97+
func e() {
98+
//#nosec
99+
}
100+
101+
// NOSONAR
102+
func f() {
103+
//NOSONAR
104+
}
105+
106+
// foo
107+
func h() {
108+
// foo
109+
}

0 commit comments

Comments
 (0)