build(deps): bump github.com/go-critic/go-critic from 0.7.0 to 0.8.0 (#…

…3810) Co-authored-by: Oleksandr Redko <[email protected]> Co-authored-by: Fernandez Ludovic <[email protected]>
golangci · Apr 30, 2023 · bc616e8 · bc616e8
1 parent 58182e7
commit bc616e8
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 3 deletions.
diff --git a/go.mod b/go.mod
@@ -32,7 +32,7 @@ require (
 	github.com/fatih/color v1.15.0
 	github.com/firefart/nonamedreturns v1.0.4
 	github.com/fzipp/gocyclo v0.6.0
-	github.com/go-critic/go-critic v0.7.0
+	github.com/go-critic/go-critic v0.8.0
 	github.com/go-xmlfmt/xmlfmt v1.1.2
 	github.com/gofrs/flock v0.8.1
 	github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2

diff --git a/go.sum b/go.sum
diff --git a/pkg/config/linters_settings.go b/pkg/config/linters_settings.go
@@ -371,6 +371,7 @@ type GoConstSettings struct {
 }
 
 type GoCriticSettings struct {
+	Go               string                           `mapstructure:"-"`
 	EnabledChecks    []string                         `mapstructure:"enabled-checks"`
 	DisabledChecks   []string                         `mapstructure:"disabled-checks"`
 	EnabledTags      []string                         `mapstructure:"enabled-tags"`

diff --git a/pkg/golinters/gocritic.go b/pkg/golinters/gocritic.go
@@ -113,6 +113,8 @@ func (w *goCriticWrapper) run(pass *analysis.Pass) ([]goanalysis.Issue, error) {
 
 	linterCtx := gocriticlinter.NewContext(pass.Fset, w.sizes)
 
+	linterCtx.SetGoVersion(w.settingsWrapper.Go)
+
 	enabledCheckers, err := w.buildEnabledCheckers(linterCtx)
 	if err != nil {
 		return nil, err

diff --git a/pkg/lint/lintersdb/manager.go b/pkg/lint/lintersdb/manager.go
@@ -263,6 +263,10 @@ func (m Manager) GetAllSupportedLinterConfigs() []*linter.Config {
 			govetCfg.Go = m.cfg.Run.Go
 		}
 
+		if gocriticCfg != nil {
+			gocriticCfg.Go = m.cfg.Run.Go
+		}
+
 		if gofumptCfg != nil && gofumptCfg.LangVersion == "" {
 			gofumptCfg.LangVersion = m.cfg.Run.Go
 		}