build(deps): bump github.com/karamaru-alpha/copyloopvar from 1.0.4 to…

… 1.0.8 (#4444)

.golangci.reference.yml

@@ -149,6 +149,11 @@ linters-settings:
     first-strong-isolate: false
     pop-directional-isolate: false
 
+  copyloopvar:
+    # If true, ignore aliasing of loop variables.
+    # Default: false
+    ignore-alias: true
+
   cyclop:
     # The maximal code complexity to report.
     # Default: 10

go.mod

@@ -61,7 +61,7 @@ require (
 	github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af
 	github.com/jjti/go-spancheck v0.5.3
 	github.com/julz/importas v0.1.0
-	github.com/karamaru-alpha/copyloopvar v1.0.4
+	github.com/karamaru-alpha/copyloopvar v1.0.8
 	github.com/kisielk/errcheck v1.7.0
 	github.com/kkHAIKE/contextcheck v1.1.4
 	github.com/kulti/thelper v0.6.3

pkg/config/linters_settings.go

@@ -206,6 +206,7 @@ var defaultLintersSettings = LintersSettings{
 type LintersSettings struct {
 	Asasalint        AsasalintSettings
 	BiDiChk          BiDiChkSettings
+	CopyLoopVar      CopyLoopVarSettings
 	Cyclop           Cyclop
 	Decorder         DecorderSettings
 	Depguard         DepGuardSettings
@@ -313,6 +314,10 @@ type BiDiChkSettings struct {
 	PopDirectionalIsolate    bool `mapstructure:"pop-directional-isolate"`
 }
 
+type CopyLoopVarSettings struct {
+	IgnoreAlias bool `mapstructure:"ignore-alias"`
+}
+
 type Cyclop struct {
 	MaxComplexity  int     `mapstructure:"max-complexity"`
 	PackageAverage float64 `mapstructure:"package-average"`

pkg/golinters/copyloopvar.go

@@ -4,16 +4,26 @@ import (
 	"github.com/karamaru-alpha/copyloopvar"
 	"golang.org/x/tools/go/analysis"
 
+	"github.com/golangci/golangci-lint/pkg/config"
 	"github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
 )
 
-func NewCopyLoopVar() *goanalysis.Linter {
-	a := copyloopvar.Analyzer
+func NewCopyLoopVar(settings *config.CopyLoopVarSettings) *goanalysis.Linter {
+	a := copyloopvar.NewAnalyzer()
+
+	var cfg map[string]map[string]any
+	if settings != nil {
+		cfg = map[string]map[string]any{
+			a.Name: {
+				"ignore-alias": settings.IgnoreAlias,
+			},
+		}
+	}
 
 	return goanalysis.NewLinter(
 		a.Name,
 		a.Doc,
 		[]*analysis.Analyzer{a},
-		nil,
+		cfg,
 	).WithLoadMode(goanalysis.LoadModeSyntax)
 }

pkg/lint/lintersdb/builder_linter.go

@@ -60,7 +60,7 @@ func (b LinterBuilder) Build(cfg *config.Config) []*linter.Config {
 			WithLoadForGoAnalysis().
 			WithURL("https://github.com/kkHAIKE/contextcheck"),
 
-		linter.NewConfig(golinters.NewCopyLoopVar()).
+		linter.NewConfig(golinters.NewCopyLoopVar(&cfg.LintersSettings.CopyLoopVar)).
 			WithSince("v1.57.0").
 			WithPresets(linter.PresetStyle).
 			WithURL("https://github.com/karamaru-alpha/copyloopvar").

test/testdata/configs/copyloopvar.yml

@@ -0,0 +1,3 @@
+linters-settings:
+  copyloopvar:
+    ignore-alias: true

test/testdata/copyloopvar.go

@@ -13,10 +13,12 @@ func copyloopvarCase1() {
 		fns = append(fns, func() {
 			fmt.Println(i)
 		})
-		_v := v // want `The copy of the 'for' variable "v" can be deleted \(Go 1\.22\+\)`
+		v := v // want `The copy of the 'for' variable "v" can be deleted \(Go 1\.22\+\)`
 		fns = append(fns, func() {
-			fmt.Println(_v)
+			fmt.Println(v)
 		})
+		_v := v // want `The copy of the 'for' variable "v" can be deleted \(Go 1\.22\+\)`
+		_ = _v
 	}
 	for _, fn := range fns {
 		fn()

test/testdata/copyloopvar_custom.go

@@ -0,0 +1,41 @@
+//go:build go1.22
+
+//golangcitest:args -Ecopyloopvar
+//golangcitest:config_path testdata/configs/copyloopvar.yml
+package testdata
+
+import "fmt"
+
+func copyloopvarCase1() {
+	slice := []int{1, 2, 3}
+	fns := make([]func(), 0, len(slice)*2)
+	for i, v := range slice {
+		i := i // want `The copy of the 'for' variable "i" can be deleted \(Go 1\.22\+\)`
+		fns = append(fns, func() {
+			fmt.Println(i)
+		})
+		v := v // want `The copy of the 'for' variable "v" can be deleted \(Go 1\.22\+\)`
+		fns = append(fns, func() {
+			fmt.Println(v)
+		})
+		_v := v
+		_ = _v
+	}
+	for _, fn := range fns {
+		fn()
+	}
+}
+
+func copyloopvarCase2() {
+	loopCount := 3
+	fns := make([]func(), 0, loopCount)
+	for i := 1; i <= loopCount; i++ {
+		i := i // want `The copy of the 'for' variable "i" can be deleted \(Go 1\.22\+\)`
+		fns = append(fns, func() {
+			fmt.Println(i)
+		})
+	}
+	for _, fn := range fns {
+		fn()
+	}
+}