Skip to content

Commit 8bb7d20

Browse files
committed
feat: don't allow formatters settings from linters settings
1 parent 76d896a commit 8bb7d20

File tree

8 files changed

+51
-31
lines changed

8 files changed

+51
-31
lines changed

pkg/config/linters_settings.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ var defaultLintersSettings = LintersSettings{
204204
}
205205

206206
type LintersSettings struct {
207-
FormatterSettings `mapstructure:",squash"`
207+
FormatterSettings `mapstructure:"-"`
208208

209209
Asasalint AsasalintSettings `mapstructure:"asasalint"`
210210
BiDiChk BiDiChkSettings `mapstructure:"bidichk"`

pkg/golinters/gci/testdata/gci.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
version: "2"
22

3-
linters-settings:
4-
gci:
5-
sections:
6-
- standard
7-
- prefix(github.com/golangci/golangci-lint,github.com/daixiang0/gci)
8-
- default
9-
custom-order: true
3+
formatters:
4+
enable:
5+
- gci
6+
settings:
7+
gci:
8+
sections:
9+
- standard
10+
- prefix(github.com/golangci/golangci-lint,github.com/daixiang0/gci)
11+
- default
12+
custom-order: true
Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
version: "2"
22

3-
linters-settings:
4-
gofmt:
5-
simplify: false
3+
formatters:
4+
enable:
5+
- gofmt
6+
settings:
7+
gofmt:
8+
simplify: false
Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
version: "2"
22

3-
linters-settings:
4-
gofmt:
5-
rewrite-rules:
6-
- pattern: 'interface{}'
7-
replacement: 'any'
8-
- pattern: 'a[b:len(a)]'
9-
replacement: 'a[b:]'
3+
formatters:
4+
enable:
5+
- gofmt
6+
settings:
7+
gofmt:
8+
rewrite-rules:
9+
- pattern: 'interface{}'
10+
replacement: 'any'
11+
- pattern: 'a[b:len(a)]'
12+
replacement: 'a[b:]'
Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
version: "2"
22

3-
linters-settings:
4-
gofumpt:
5-
extra-rules: true
3+
formatters:
4+
enable:
5+
- gofumpt
6+
settings:
7+
gofumpt:
8+
extra-rules: true
Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
version: "2"
22

3-
linters-settings:
4-
gofumpt:
5-
extra-rules: true
3+
formatters:
4+
enable:
5+
- gofumpt
6+
settings:
7+
gofumpt:
8+
extra-rules: true
Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
version: "2"
22

3-
linters-settings:
4-
goimports:
5-
local-prefixes: github.com/golangci/golangci-lint
3+
formatters:
4+
enable:
5+
- goimports
6+
settings:
7+
goimports:
8+
local-prefixes: github.com/golangci/golangci-lint
Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
version: "2"
22

3-
linters-settings:
4-
gofumpt:
5-
extra-rules: true
6-
3+
formatters:
4+
enable:
5+
- gofumpt
6+
settings:
7+
gofumpt:
8+
extra-rules: true

0 commit comments

Comments
 (0)