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

errcheck: add an option to remove default exclusions (#2607)

Browse Source
This commit is contained in:
Ludovic Fernandez 2022-02-21 16:39:17 +01:00 committed by GitHub
parent 0e7233eb29
commit 2f689958c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.golangci.example.yml
View File

@ -204,6 +204,11 @@ linters-settings:
# see https://github.com/kisielk/errcheck#the-deprecated-method for details # see https://github.com/kisielk/errcheck#the-deprecated-method for details
ignore: fmt:.*,io/ioutil:^Read.* ignore: fmt:.*,io/ioutil:^Read.*
# To disable the errcheck built-in exclude list.
# See `-excludeonly` option in https://github.com/kisielk/errcheck#excluding-functions for details.
# Default: false
disable-default-exclusions: true
# DEPRECATED use exclude-functions instead. # DEPRECATED use exclude-functions instead.
# #
# Path to a file containing a list of functions to exclude from checking. # Path to a file containing a list of functions to exclude from checking.

9
pkg/config/linters_settings.go
View File

@ -215,10 +215,11 @@ type DuplSettings struct {
} }
type ErrcheckSettings struct { type ErrcheckSettings struct {
CheckTypeAssertions bool `mapstructure:"check-type-assertions"` DisableDefaultExclusions bool `mapstructure:"disable-default-exclusions"`
CheckAssignToBlank bool `mapstructure:"check-blank"` CheckTypeAssertions bool `mapstructure:"check-type-assertions"`
Ignore string `mapstructure:"ignore"` CheckAssignToBlank bool `mapstructure:"check-blank"`
ExcludeFunctions []string `mapstructure:"exclude-functions"` Ignore string `mapstructure:"ignore"`
ExcludeFunctions []string `mapstructure:"exclude-functions"`
// Deprecated: use ExcludeFunctions instead // Deprecated: use ExcludeFunctions instead
Exclude string `mapstructure:"exclude"` Exclude string `mapstructure:"exclude"`

5
pkg/golinters/errcheck.go
View File

@ -140,10 +140,13 @@ func getChecker(errCfg *config.ErrcheckSettings) (*errcheck.Checker, error) {
BlankAssignments: !errCfg.CheckAssignToBlank, BlankAssignments: !errCfg.CheckAssignToBlank,
TypeAssertions: !errCfg.CheckTypeAssertions, TypeAssertions: !errCfg.CheckTypeAssertions,
SymbolRegexpsByPackage: map[string]*regexp.Regexp{}, SymbolRegexpsByPackage: map[string]*regexp.Regexp{},
Symbols: append([]string{}, errcheck.DefaultExcludedSymbols...),
}, },
} }
if !errCfg.DisableDefaultExclusions {
checker.Exclusions.Symbols = append(checker.Exclusions.Symbols, errcheck.DefaultExcludedSymbols...)
}
for pkg, re := range ignoreConfig { for pkg, re := range ignoreConfig {
checker.Exclusions.SymbolRegexpsByPackage[pkg] = re checker.Exclusions.SymbolRegexpsByPackage[pkg] = re
} }