Skip to content

Commit

Permalink
Add wrapcheck linter config
Browse files Browse the repository at this point in the history
  • Loading branch information
tomarrell committed Apr 30, 2021
1 parent 54bfbb9 commit 1908133
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 8 deletions.
9 changes: 9 additions & 0 deletions .golangci.example.yml
Original file line number Diff line number Diff line change
Expand Up @@ -541,6 +541,15 @@ linters-settings:
multi-if: false # Enforces newlines (or comments) after every multi-line if statement
multi-func: false # Enforces newlines (or comments) after every multi-line function signature

wrapcheck:
ignoreSigs:
- .Errorf(
- errors.New(
- errors.Unwrap(
- .Wrap(
- .Wrapf(
- .WithMessage(

wsl:
# See https://github.com/bombsimon/wsl/blob/master/doc/configuration.md for
# documentation of available settings. These are the defaults for
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ require (
github.com/tdakkota/asciicheck v0.0.0-20200416200610-e657995f937b
github.com/tetafro/godot v1.4.6
github.com/timakin/bodyclose v0.0.0-20200424151742-cb6215831a94
github.com/tomarrell/wrapcheck v1.2.0
github.com/tomarrell/wrapcheck/v2 v2.1.0
github.com/tommy-muehle/go-mnd/v2 v2.3.2
github.com/ultraware/funlen v0.0.3
github.com/ultraware/whitespace v0.0.4
Expand Down
4 changes: 2 additions & 2 deletions go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions pkg/config/linters_settings.go
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ type LintersSettings struct {
Unused UnusedSettings
Varcheck VarCheckSettings
Whitespace WhitespaceSettings
Wrapcheck WrapcheckSettings
WSL WSLSettings

Custom map[string]CustomLinterSettings
Expand Down Expand Up @@ -427,6 +428,10 @@ type WhitespaceSettings struct {
MultiFunc bool `mapstructure:"multi-func"`
}

type WrapcheckSettings struct {
IgnoreSigs []string `mapstructure:"ignoreSigs"`
}

type WSLSettings struct {
StrictAppend bool `mapstructure:"strict-append"`
AllowAssignAndCallCuddle bool `mapstructure:"allow-assign-and-call"`
Expand Down
14 changes: 10 additions & 4 deletions pkg/golinters/wrapcheck.go
Original file line number Diff line number Diff line change
@@ -1,19 +1,25 @@
package golinters

import (
"github.com/tomarrell/wrapcheck/wrapcheck"
"github.com/tomarrell/wrapcheck/v2/wrapcheck"
"golang.org/x/tools/go/analysis"

"github.com/golangci/golangci-lint/pkg/config"
"github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
)

const wrapcheckName = "wrapcheck"

func NewWrapcheck() *goanalysis.Linter {
func NewWrapcheck(cfg config.WrapcheckSettings) *goanalysis.Linter {
c := wrapcheck.NewDefaultConfig()
c.IgnoreSigs = cfg.IgnoreSigs

a := wrapcheck.NewAnalyzer(c)

return goanalysis.NewLinter(
wrapcheckName,
wrapcheck.Analyzer.Doc,
[]*analysis.Analyzer{wrapcheck.Analyzer},
a.Doc,
[]*analysis.Analyzer{a},
nil,
).WithLoadMode(goanalysis.LoadModeTypesInfo)
}
4 changes: 3 additions & 1 deletion pkg/lint/lintersdb/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ func (m Manager) GetAllSupportedLinterConfigs() []*linter.Config {
var goModDirectivesCfg *config.GoModDirectivesSettings
var tagliatelleCfg *config.TagliatelleSettings
var gosecCfg *config.GoSecSettings
var wrapcheckCfg *config.WrapcheckSettings

if m.cfg != nil {
govetCfg = &m.cfg.LintersSettings.Govet
Expand All @@ -129,6 +130,7 @@ func (m Manager) GetAllSupportedLinterConfigs() []*linter.Config {
goModDirectivesCfg = &m.cfg.LintersSettings.GoModDirectives
tagliatelleCfg = &m.cfg.LintersSettings.Tagliatelle
gosecCfg = &m.cfg.LintersSettings.Gosec
wrapcheckCfg = &m.cfg.LintersSettings.Wrapcheck
}

const megacheckName = "megacheck"
Expand Down Expand Up @@ -403,7 +405,7 @@ func (m Manager) GetAllSupportedLinterConfigs() []*linter.Config {
WithSince("v1.30.0").
WithPresets(linter.PresetStyle).
WithURL("https://github.com/ssgreg/nlreturn"),
linter.NewConfig(golinters.NewWrapcheck()).
linter.NewConfig(golinters.NewWrapcheck(wrapcheckCfg)).
WithSince("v1.32.0").
WithPresets(linter.PresetStyle, linter.PresetError).
WithLoadForGoAnalysis().
Expand Down

0 comments on commit 1908133

Please sign in to comment.