diff --git a/pkg/golinters/varnamelen/testdata/varnamelen_configuration.go b/pkg/golinters/varnamelen/testdata/varnamelen_configuration.go new file mode 100644 index 000000000000..7e56da20a522 --- /dev/null +++ b/pkg/golinters/varnamelen/testdata/varnamelen_configuration.go @@ -0,0 +1,30 @@ +//golangcitest:args -Evarnamelen +//golangcitest:config_path testdata/varnamelen_configuration.yml +//golangcitest:expected_exitcode 0 +package testdata + +import "fmt" + +func _() { + ok := foo() + + fmt.Println("a") + fmt.Println("b") + fmt.Println("c") + fmt.Println("d") + println(ok) +} + +func _() { + fn := foo() + + fmt.Println("a") + fmt.Println("b") + fmt.Println("c") + fmt.Println("d") + println(fn) +} + +func foo() bool { + return true +} diff --git a/pkg/golinters/varnamelen/testdata/varnamelen_configuration.yml b/pkg/golinters/varnamelen/testdata/varnamelen_configuration.yml new file mode 100644 index 000000000000..0055c1ebcef3 --- /dev/null +++ b/pkg/golinters/varnamelen/testdata/varnamelen_configuration.yml @@ -0,0 +1,9 @@ +version: "2" + +linters: + settings: + varnamelen: + ignore-names: + - fn + ignore-decls: + - ok bool diff --git a/pkg/golinters/varnamelen/varnamelen.go b/pkg/golinters/varnamelen/varnamelen.go index a19d7987ddcd..349feefa070b 100644 --- a/pkg/golinters/varnamelen/varnamelen.go +++ b/pkg/golinters/varnamelen/varnamelen.go @@ -14,7 +14,7 @@ func New(settings *config.VarnamelenSettings) *goanalysis.Linter { var cfg map[string]any if settings != nil { - vnlCfg := map[string]any{ + cfg = map[string]any{ "checkReceiver": strconv.FormatBool(settings.CheckReceiver), "checkReturn": strconv.FormatBool(settings.CheckReturn), "checkTypeParam": strconv.FormatBool(settings.CheckTypeParam), @@ -26,11 +26,11 @@ func New(settings *config.VarnamelenSettings) *goanalysis.Linter { } if settings.MaxDistance > 0 { - vnlCfg["maxDistance"] = strconv.Itoa(settings.MaxDistance) + cfg["maxDistance"] = strconv.Itoa(settings.MaxDistance) } if settings.MinNameLength > 0 { - vnlCfg["minNameLength"] = strconv.Itoa(settings.MinNameLength) + cfg["minNameLength"] = strconv.Itoa(settings.MinNameLength) } }