Skip to content

Commit d073b75

Browse files
committed
chore: remove allow-leading-space
1 parent a6365e5 commit d073b75

File tree

4 files changed

+3
-7
lines changed

4 files changed

+3
-7
lines changed

.golangci.yml

-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ linters-settings:
6161
misspell:
6262
locale: US
6363
nolintlint:
64-
allow-leading-space: false
6564
allow-unused: false # report any unused nolint directives
6665
require-explanation: false # don't require an explanation for nolint directives
6766
require-specific: false # don't require nolint directives to be specific about which linter is being skipped

test/testdata/fix/in/nolintlint.go

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
//golangcitest:args -Enolintlint -Elll
22
//golangcitest:expected_linter nolintlint
3-
//golangcitest:config linters-settings.nolintlint.allow-leading-space=false
43
package p
54

65
import "fmt"

test/testdata/fix/out/nolintlint.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
//golangcitest:args -Enolintlint -Elll
22
//golangcitest:expected_linter nolintlint
3-
//golangcitest:config linters-settings.nolintlint.allow-leading-space=false
43
package p
54

65
import "fmt"
@@ -10,8 +9,8 @@ func nolintlint() {
109
fmt.Println() //nolint:bob // leading spaces should be dropped
1110

1211
// note that the next lines will retain trailing whitespace when fixed
13-
fmt.Println()
14-
fmt.Println()
12+
fmt.Println()
13+
fmt.Println()
1514

1615
fmt.Println() //nolint:alice,lll // we don't drop individual linters from lists
1716
}

test/testdata/nolintlint.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@
22
//golangcitest:expected_linter nolintlint
33
//golangcitest:config linters-settings.nolintlint.require-explanation=true
44
//golangcitest:config linters-settings.nolintlint.require-specific=true
5-
//golangcitest:config linters-settings.nolintlint.allow-leading-space=false
65
package testdata
76

87
import "fmt"
98

109
func Foo() {
11-
fmt.Println("not specific") //nolint // ERROR "directive `.*` should mention specific linter such as `//nolint:my-linter`"
10+
fmt.Println("not specific") // nolint // ERROR "directive `.*` should mention specific linter such as `//nolint:my-linter`"
1211
fmt.Println("not machine readable") // nolint // ERROR "directive `.*` should be written as `//nolint`"
1312
fmt.Println("extra spaces") // nolint:deadcode // because // ERROR "directive `.*` should not have more than one leading space"
1413

0 commit comments

Comments
 (0)