Skip to content

Commit eb31441

Browse files
committed
review
1 parent fbf029d commit eb31441

2 files changed

Lines changed: 24 additions & 24 deletions

File tree

jsonschema/golangci.next.jsonschema.json

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3360,24 +3360,6 @@
33603360
}
33613361
}
33623362
},
3363-
"sloglintCustomFunc": {
3364-
"type": "object",
3365-
"additionalProperties": false,
3366-
"properties": {
3367-
"name": {
3368-
"description": "The full name of the function, including the package. If the function is a method, the receiver type must be wrapped in parentheses.",
3369-
"type": "string"
3370-
},
3371-
"msg-pos": {
3372-
"description": "The position of the \"msg string\" argument in the function signature, starting from 0. If there is no message in the function, a negative value must be passed.",
3373-
"type": "integer"
3374-
},
3375-
"args-pos": {
3376-
"description": "The position of the \"args ...any\" argument in the function signature, starting from 0. If there are no arguments in the function, a negative value must be passed.",
3377-
"type": "integer"
3378-
}
3379-
}
3380-
},
33813363
"sloglintSettings": {
33823364
"type": "object",
33833365
"additionalProperties": false,
@@ -3454,6 +3436,24 @@
34543436
}
34553437
}
34563438
},
3439+
"sloglintCustomFunc": {
3440+
"type": "object",
3441+
"additionalProperties": false,
3442+
"properties": {
3443+
"name": {
3444+
"description": "The full name of the function, including the package. If the function is a method, the receiver type must be wrapped in parentheses.",
3445+
"type": "string"
3446+
},
3447+
"msg-pos": {
3448+
"description": "The position of the \"msg string\" argument in the function signature, starting from 0. If there is no message in the function, a negative value must be passed.",
3449+
"type": "integer"
3450+
},
3451+
"args-pos": {
3452+
"description": "The position of the \"args ...any\" argument in the function signature, starting from 0. If there are no arguments in the function, a negative value must be passed.",
3453+
"type": "integer"
3454+
}
3455+
}
3456+
},
34573457
"spancheckSettings": {
34583458
"type": "object",
34593459
"additionalProperties": false,

pkg/config/linters_settings.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -917,12 +917,6 @@ type RowsErrCheckSettings struct {
917917
Packages []string `mapstructure:"packages"`
918918
}
919919

920-
type SloglintCustomFunc struct {
921-
Name string `mapstructure:"name"`
922-
MsgPos int `mapstructure:"msg-pos"`
923-
ArgsPos int `mapstructure:"args-pos"`
924-
}
925-
926920
type SloglintSettings struct {
927921
NoGlobal string `mapstructure:"no-global"`
928922
Context string `mapstructure:"context"`
@@ -939,6 +933,12 @@ type SloglintSettings struct {
939933
CustomFuncs []SloglintCustomFunc `mapstructure:"custom-funcs"`
940934
}
941935

936+
type SloglintCustomFunc struct {
937+
Name string `mapstructure:"name"`
938+
MsgPos int `mapstructure:"msg-pos"`
939+
ArgsPos int `mapstructure:"args-pos"`
940+
}
941+
942942
type SpancheckSettings struct {
943943
Checks []string `mapstructure:"checks"`
944944
IgnoreCheckSignatures []string `mapstructure:"ignore-check-signatures"`

0 commit comments

Comments
 (0)