eeafj/golangci-lint
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

wsl: fix force-err-cuddling flag (#3407)

Browse Source
This commit is contained in:
Carlos Henrique Guardão Gandarez 2022-12-12 14:52:37 -03:00 committed by GitHub
parent b2462ed752
commit 0cc3585947
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.golangci.reference.yml
View File

@ -1928,15 +1928,15 @@ linters-settings:
# Causes an error when an If statement that checks an error variable doesn't # Causes an error when an If statement that checks an error variable doesn't
# cuddle with the assignment of that variable. # cuddle with the assignment of that variable.
enforce-err-cuddling: false force-err-cuddling: false
# When enforce-err-cuddling is enabled this is a list of names # When force-err-cuddling is enabled this is a list of names
# used for error variables to check for in the conditional. # used for error variables to check for in the conditional.
error-variable-names: [ "err" ] error-variable-names: [ "err" ]
# Causes an error if a short declaration (:=) cuddles with anything other than # Causes an error if a short declaration (:=) cuddles with anything other than
# another short declaration. # another short declaration.
# This logic overrides enforce-err-cuddling among others. # This logic overrides force-err-cuddling among others.
force-short-decl-cuddling: false force-short-decl-cuddling: false
# The custom section can be used to define linter plugins to be loaded at runtime. # The custom section can be used to define linter plugins to be loaded at runtime.

2
pkg/config/linters_settings.go
View File

@ -713,7 +713,7 @@ type WSLSettings struct {
AllowCuddleDeclaration bool `mapstructure:"allow-cuddle-declarations"` AllowCuddleDeclaration bool `mapstructure:"allow-cuddle-declarations"`
AllowCuddleWithCalls []string `mapstructure:"allow-cuddle-with-calls"` AllowCuddleWithCalls []string `mapstructure:"allow-cuddle-with-calls"`
AllowCuddleWithRHS []string `mapstructure:"allow-cuddle-with-rhs"` AllowCuddleWithRHS []string `mapstructure:"allow-cuddle-with-rhs"`
ForceCuddleErrCheckAndAssign bool `mapstructure:"enforce-err-cuddling"` ForceCuddleErrCheckAndAssign bool `mapstructure:"force-err-cuddling"`
ErrorVariableNames []string `mapstructure:"error-variable-names"` ErrorVariableNames []string `mapstructure:"error-variable-names"`
ForceExclusiveShortDeclarations bool `mapstructure:"force-short-decl-cuddling"` ForceExclusiveShortDeclarations bool `mapstructure:"force-short-decl-cuddling"`
} }

3
pkg/golinters/wsl.go
View File

@ -32,6 +32,9 @@ func NewWSL(settings *config.WSLSettings) *goanalysis.Linter {
conf.AllowCuddleDeclaration = settings.AllowCuddleDeclaration conf.AllowCuddleDeclaration = settings.AllowCuddleDeclaration
conf.AllowCuddleWithCalls = settings.AllowCuddleWithCalls conf.AllowCuddleWithCalls = settings.AllowCuddleWithCalls
conf.AllowCuddleWithRHS = settings.AllowCuddleWithRHS conf.AllowCuddleWithRHS = settings.AllowCuddleWithRHS
conf.ForceCuddleErrCheckAndAssign = settings.ForceCuddleErrCheckAndAssign
conf.ErrorVariableNames = settings.ErrorVariableNames
conf.ForceExclusiveShortDeclarations = settings.ForceExclusiveShortDeclarations
} }
analyzer := &analysis.Analyzer{ analyzer := &analysis.Analyzer{