build(deps): bump github.com/go-critic/go-critic from 0.6.3 to 0.6.4 (#3089)

Co-authored-by: Fernandez Ludovic <[email protected]>

Author: dependabot[bot]

.golangci.reference.yml

@@ -1113,7 +1113,7 @@ linters-settings:
   makezero:
     # Allow only slices initialized with a length of zero.
     # Default: false
-    always: false
+    always: true
 
   maligned:
     # Print struct with more effective memory layout or not.

.golangci.yml

@@ -27,7 +27,6 @@ linters-settings:
       - ifElseChain
       - octalLiteral
       - whyNoLint
-      - wrapperFunc
   gocyclo:
     min-complexity: 15
   goimports:

go.mod

@@ -27,7 +27,7 @@ require (
 	github.com/fatih/color v1.13.0
 	github.com/firefart/nonamedreturns v1.0.4
 	github.com/fzipp/gocyclo v0.6.0
-	github.com/go-critic/go-critic v0.6.3
+	github.com/go-critic/go-critic v0.6.4
 	github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b
 	github.com/gofrs/flock v0.8.1
 	github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2
@@ -121,8 +121,8 @@ require (
 	github.com/fsnotify/fsnotify v1.5.4 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
 	github.com/go-toolsmith/astcast v1.0.0 // indirect
-	github.com/go-toolsmith/astcopy v1.0.0 // indirect
-	github.com/go-toolsmith/astequal v1.0.1 // indirect
+	github.com/go-toolsmith/astcopy v1.0.1 // indirect
+	github.com/go-toolsmith/astequal v1.0.2 // indirect
 	github.com/go-toolsmith/astfmt v1.0.0 // indirect
 	github.com/go-toolsmith/astp v1.0.0 // indirect
 	github.com/go-toolsmith/strparse v1.0.0 // indirect
@@ -153,7 +153,7 @@ require (
 	github.com/prometheus/client_model v0.2.0 // indirect
 	github.com/prometheus/common v0.32.1 // indirect
 	github.com/prometheus/procfs v0.7.3 // indirect
-	github.com/quasilyte/go-ruleguard v0.3.16-0.20220213074421-6aa060fab41a // indirect
+	github.com/quasilyte/go-ruleguard v0.3.17 // indirect
 	github.com/quasilyte/gogrep v0.0.0-20220120141003-628d8b3623b5 // indirect
 	github.com/quasilyte/regex/syntax v0.0.0-20200407221936-30656e2c4a95 // indirect
 	github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect

go.sum

@@ -117,11 +117,6 @@ func NewExecutor(version, commit, date string) *Executor {
 	// recreate after getting config
 	e.DBManager = lintersdb.NewManager(e.cfg, e.log).WithCustomLinters()
 
-	e.cfg.LintersSettings.Gocritic.InferEnabledChecks(e.log)
-	if err = e.cfg.LintersSettings.Gocritic.Validate(e.log); err != nil {
-		e.log.Fatalf("Invalid gocritic settings: %s", err)
-	}
-
 	// Slice options must be explicitly set for proper merging of config and command-line options.
 	fixSlicesFlags(e.runCmd.Flags())
 	fixSlicesFlags(e.lintersCmd.Flags())

pkg/commands/executor.go

@@ -40,8 +40,8 @@ var defaultLintersSettings = LintersSettings{
 	Gocognit: GocognitSettings{
 		MinComplexity: 30,
 	},
-	Gocritic: GocriticSettings{
-		SettingsPerCheck: map[string]GocriticCheckSettings{},
+	Gocritic: GoCriticSettings{
+		SettingsPerCheck: map[string]GoCriticCheckSettings{},
 	},
 	Godox: GodoxSettings{
 		Keywords: []string{},
@@ -133,7 +133,7 @@ type LintersSettings struct {
 	Gci              GciSettings
 	Gocognit         GocognitSettings
 	Goconst          GoConstSettings
-	Gocritic         GocriticSettings
+	Gocritic         GoCriticSettings
 	Gocyclo          GoCycloSettings
 	Godot            GodotSettings
 	Godox            GodoxSettings
@@ -306,6 +306,16 @@ type GoConstSettings struct {
 	IgnoreCalls         bool `mapstructure:"ignore-calls"`
 }
 
+type GoCriticSettings struct {
+	EnabledChecks    []string                         `mapstructure:"enabled-checks"`
+	DisabledChecks   []string                         `mapstructure:"disabled-checks"`
+	EnabledTags      []string                         `mapstructure:"enabled-tags"`
+	DisabledTags     []string                         `mapstructure:"disabled-tags"`
+	SettingsPerCheck map[string]GoCriticCheckSettings `mapstructure:"settings"`
+}
+
+type GoCriticCheckSettings map[string]interface{}
+
 type GoCycloSettings struct {
 	MinComplexity int `mapstructure:"min-complexity"`
 }

pkg/config/linters_settings.go

@@ -1,4 +1,4 @@
-package config
+package golinters
 
 import (
 	"log"
@@ -25,7 +25,9 @@ func Test_filterByDisableTags(t *testing.T) {
 	disabledTags := []string{"experimental", "opinionated"}
 	enabledChecks := []string{"appendAssign", "sortSlice", "caseOrder", "dupImport"}
 
-	filterEnabledChecks := filterByDisableTags(enabledChecks, disabledTags, &tLog{})
+	settingsWrapper := newGoCriticSettingsWrapper(nil)
+
+	filterEnabledChecks := settingsWrapper.filterByDisableTags(enabledChecks, disabledTags, &tLog{})
 
 	sort.Strings(filterEnabledChecks)
 

pkg/config/linters_settings_gocritic.go

@@ -88,7 +88,7 @@ func getLLLIssuesForFile(filename string, maxLineLen int, tabSpaces string) ([]r
 	scanner := bufio.NewScanner(f)
 	for scanner.Scan() {
 		line := scanner.Text()
-		line = strings.Replace(line, "\t", tabSpaces, -1)
+		line = strings.ReplaceAll(line, "\t", tabSpaces)
 		lineLen := utf8.RuneCountInString(line)
 		if lineLen > maxLineLen {
 			res = append(res, result.Issue{

pkg/golinters/gocritic.go

@@ -119,7 +119,7 @@ func (m Manager) GetAllSupportedLinterConfigs() []*linter.Config {
 		gciCfg              *config.GciSettings
 		gocognitCfg         *config.GocognitSettings
 		goconstCfg          *config.GoConstSettings
-		gocriticCfg         *config.GocriticSettings
+		gocriticCfg         *config.GoCriticSettings
 		gocycloCfg          *config.GoCycloSettings
 		godotCfg            *config.GodotSettings
 		godoxCfg            *config.GodoxSettings
@@ -436,7 +436,7 @@ func (m Manager) GetAllSupportedLinterConfigs() []*linter.Config {
 			WithPresets(linter.PresetStyle).
 			WithURL("https://github.com/jgautheron/goconst"),
 
-		linter.NewConfig(golinters.NewGocritic(gocriticCfg, m.cfg)).
+		linter.NewConfig(golinters.NewGoCritic(gocriticCfg, m.cfg)).
 			WithSince("v1.12.0").
 			WithPresets(linter.PresetStyle, linter.PresetMetaLinter).
 			WithLoadForGoAnalysis().

pkg/config/linters_settings_gocritic_test.go renamed to pkg/golinters/gocritic_test.go

@@ -31,8 +31,8 @@ func (p PathShortener) Name() string {
 func (p PathShortener) Process(issues []result.Issue) ([]result.Issue, error) {
 	return transformIssues(issues, func(i *result.Issue) *result.Issue {
 		newI := i
-		newI.Text = strings.Replace(newI.Text, p.wd+"/", "", -1)
-		newI.Text = strings.Replace(newI.Text, p.wd, "", -1)
+		newI.Text = strings.ReplaceAll(newI.Text, p.wd+"/", "")
+		newI.Text = strings.ReplaceAll(newI.Text, p.wd, "")
 		return newI
 	}), nil
 }

pkg/golinters/lll.go

@@ -33,7 +33,7 @@ func errorCheck(outStr string, wantAuto bool, defaultWantedLinter string, fullsh
 	for i := range out {
 		for j := 0; j < len(fullshort); j += 2 {
 			full, short := fullshort[j], fullshort[j+1]
-			out[i] = strings.Replace(out[i], full, short, -1)
+			out[i] = strings.ReplaceAll(out[i], full, short)
 		}
 	}
 

pkg/lint/lintersdb/manager.go

@@ -3,10 +3,11 @@ linters-settings:
     enabled-checks:
       - rangeValCopy
       - flagDeref
+      - wrapperFunc
       - ruleguard
     settings:
-      rangevalcopy:
-        sizethreshold: 2
+      rangeValCopy:
+        sizeThreshold: 2
       ruleguard:
         debug: dupSubExpr
         failOn: dsl,import

pkg/result/processors/path_shortener.go

@@ -42,3 +42,7 @@ func gocriticDup(x bool) {
 		log.Print("x is true")
 	}
 }
+
+func gocriticRuleWrapperFunc() {
+	strings.Replace("abcabc", "a", "d", -1) // ERROR "ruleguard: this Replace call can be simplified.*"
+}

test/errchk.go

@@ -154,7 +154,7 @@ func (r *LintRunner) RunCommandWithYamlConfig(cfg, command string, args ...strin
 	}
 
 	cfg = strings.TrimSpace(cfg)
-	cfg = strings.Replace(cfg, "\t", " ", -1)
+	cfg = strings.ReplaceAll(cfg, "\t", " ")
 
 	err = os.WriteFile(cfgPath, []byte(cfg), os.ModePerm)
 	assert.NoError(r.t, err)