Merge branch 'main' into gofuncor

Author: ldez

.golangci.next.reference.yml

@@ -641,7 +641,14 @@ linters:
       ignore-calls: false
       # Exclude strings matching the given regular expression.
       # Default: ""
-      ignore-strings: 'foo.+'
+      ignore-string-values:
+        - 'foo.+'
+      # Detects constants with identical values.
+      # Default: false
+      find-duplicates: true
+      # Evaluates of constant expressions like Prefix + "suffix".
+      # Default: false
+      eval-const-expressions: true
 
     gocritic:
       # Disable all checks.
@@ -1590,6 +1597,8 @@ linters:
         - findcall
         # Report assembly that clobbers the frame pointer before saving it.
         - framepointer
+        # Report using Go 1.22 enhanced ServeMux patterns in older Go versions.
+        - httpmux
         # Check for mistakes using HTTP responses.
         - httpresponse
         # Detect impossible interface-to-interface type assertions.
@@ -1671,6 +1680,7 @@ linters:
         - fieldalignment
         - findcall
         - framepointer
+        - httpmux
         - httpresponse
         - ifaceassert
         - loopclosure

.pre-commit-hooks.yaml

@@ -8,12 +8,20 @@
   pass_filenames: false
 - id: golangci-lint-full
   name: golangci-lint-full
-  description: Fast linters runner for Go. Runs on all files in the repo. Use this hook if you use pre-commit in CI.
+  description: Fast linters runner for Go. Runs on all files in the module. Use this hook if you use pre-commit in CI.
   entry: golangci-lint run --fix
   types: [go]
   language: golang
   require_serial: true
   pass_filenames: false
+- id: golangci-lint-fmt
+  name: golangci-lint-fmt
+  description: Fast linters runner for Go. Formats all files in the repo.
+  entry: golangci-lint fmt
+  types: [go]
+  language: golang
+  require_serial: true
+  pass_filenames: false
 - id: golangci-lint-config-verify
   name: golangci-lint-config-verify
   description: Verifies the configuration file

docs/src/docs/welcome/integrations.mdx

@@ -12,12 +12,10 @@ Install [plugin](https://plugins.jetbrains.com/plugin/12496-go-linter).
 
 ### Visual Studio Code
 
-The integration for golangci-lint v2 is currently in work in progress: [vscode-go#3732](https://github.com/golang/vscode-go/issues/3732).
-
 Install the [extension](https://marketplace.visualstudio.com/items?itemName=golang.Go).
 
 <details>
-<summary style={{color: '#737380'}}>Recommended settings</summary>
+<summary style={{color: '#737380'}}>Recommended settings for those who installed golangci-lint manually</summary>
 
 ```json
 "go.lintTool": "golangci-lint",
@@ -35,7 +33,34 @@ Install the [extension](https://marketplace.visualstudio.com/items?itemName=gola
 ```
 
 Using it in an editor without `--fast-only` can freeze your editor.
-Golangci-lint automatically discovers `.golangci.yml` config for edited file: you don't need to configure it in VS Code settings.
+Golangci-lint automatically discovers the `.golangci.yml` config for the edited file, so you don't need to configure it in VS Code settings.
+
+</details>
+
+<details>
+<summary style={{color: '#737380'}}>Recommended settings for those who installed golangci-lint via extension</summary>
+
+Install `golangci-lint-v2` via the `Go: Install/Update Tools` command after setting these configs.
+This will enable golangci-lint v1 to co-exist with v2.
+And use the following settings:
+
+```json
+"go.lintTool": "golangci-lint-v2",
+"go.lintFlags": [
+  "--fast-only"
+],
+"go.formatTool": "custom",
+"go.alternateTools": {
+  "customFormatter": "golangci-lint-v2"
+},
+"go.formatFlags": [
+  "fmt",
+  "--stdin"
+]
+```
+
+Using it in an editor without `--fast-only` can freeze your editor.
+Golangci-lint automatically discovers the `.golangci.yml` config for the edited file, so you don't need to configure it in VS Code settings.
 
 </details>
 

go.mod

@@ -28,7 +28,7 @@ require (
 	github.com/bombsimon/wsl/v4 v4.7.0
 	github.com/breml/bidichk v0.3.3
 	github.com/breml/errchkjson v0.4.1
-	github.com/butuzov/ireturn v0.3.1
+	github.com/butuzov/ireturn v0.4.0
 	github.com/butuzov/mirror v1.3.0
 	github.com/catenacyber/perfsprint v0.9.1
 	github.com/charithe/durationcheck v0.0.10
@@ -52,12 +52,12 @@ require (
 	github.com/golangci/misspell v0.6.0
 	github.com/golangci/plugin-module-register v0.1.1
 	github.com/golangci/revgrep v0.8.0
-	github.com/golangci/unconvert v0.0.0-20240309020433-c5143eacb3ed
+	github.com/golangci/unconvert v0.0.0-20250410112200-a129a6e6413e
 	github.com/gordonklaus/ineffassign v0.1.0
 	github.com/gostaticanalysis/forcetypeassert v0.2.0
 	github.com/gostaticanalysis/nilerr v0.1.1
 	github.com/hashicorp/go-version v1.7.0
-	github.com/jgautheron/goconst v1.7.1
+	github.com/jgautheron/goconst v1.8.1
 	github.com/jingyugao/rowserrcheck v1.1.1
 	github.com/jjti/go-spancheck v0.6.4
 	github.com/julz/importas v0.2.0
@@ -86,7 +86,7 @@ require (
 	github.com/nishanths/exhaustive v0.12.0
 	github.com/nishanths/predeclared v0.2.2
 	github.com/nunnatsa/ginkgolinter v0.19.1
-	github.com/pelletier/go-toml/v2 v2.2.3
+	github.com/pelletier/go-toml/v2 v2.2.4
 	github.com/polyfloyd/go-errorlint v1.8.0
 	github.com/quasilyte/go-ruleguard/dsl v0.3.22
 	github.com/raeperd/recvcheck v0.2.0
@@ -112,7 +112,7 @@ require (
 	github.com/tdakkota/asciicheck v0.4.1
 	github.com/tetafro/godot v1.5.0
 	github.com/timakin/bodyclose v0.0.0-20241222091800-1db5c5ca4d67
-	github.com/timonwong/loggercheck v0.10.1
+	github.com/timonwong/loggercheck v0.11.0
 	github.com/tomarrell/wrapcheck/v2 v2.11.0
 	github.com/tommy-muehle/go-mnd/v2 v2.5.1
 	github.com/ultraware/funlen v0.2.0
@@ -130,7 +130,7 @@ require (
 	go.uber.org/automaxprocs v1.6.0
 	golang.org/x/mod v0.24.0
 	golang.org/x/sys v0.32.0
-	golang.org/x/tools v0.31.0
+	golang.org/x/tools v0.32.0
 	gopkg.in/yaml.v3 v3.0.1
 	honnef.co/go/tools v0.6.1
 	mvdan.cc/gofumpt v0.7.0
@@ -209,7 +209,7 @@ require (
 	go.uber.org/zap v1.24.0 // indirect
 	golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
 	golang.org/x/exp/typeparams v0.0.0-20250210185358-939b2ce775ac // indirect
-	golang.org/x/sync v0.12.0 // indirect
+	golang.org/x/sync v0.13.0 // indirect
 	golang.org/x/text v0.23.0 // indirect
 	google.golang.org/protobuf v1.36.6 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect

go.sum

@@ -539,6 +539,7 @@
         "fieldalignment",
         "findcall",
         "framepointer",
+        "httpmux",
         "httpresponse",
         "ifaceassert",
         "loopclosure",
@@ -1487,9 +1488,12 @@
               "type": "boolean",
               "default": true
             },
-            "ignore-strings": {
+            "ignore-string-values": {
               "description": "Exclude strings matching the given regular expression",
-              "type": "string"
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
             },
             "numbers": {
               "description": "Search also for duplicated numbers.",
@@ -1505,6 +1509,16 @@
               "description": "Maximum value, only works with `numbers`",
               "type": "integer",
               "default": 3
+            },
+            "find-duplicates": {
+              "description": "Detects constants with identical values",
+              "type": "boolean",
+              "default": false
+            },
+            "eval-const-expressions": {
+              "description": "Evaluates of constant expressions like Prefix + \"suffix\"",
+              "type": "boolean",
+              "default": false
             }
           }
         },

jsonschema/golangci.next.jsonschema.json

@@ -457,14 +457,19 @@ type GocognitSettings struct {
 }
 
 type GoConstSettings struct {
-	IgnoreStrings       string `mapstructure:"ignore-strings"`
-	MatchWithConstants  bool   `mapstructure:"match-constant"`
-	MinStringLen        int    `mapstructure:"min-len"`
-	MinOccurrencesCount int    `mapstructure:"min-occurrences"`
-	ParseNumbers        bool   `mapstructure:"numbers"`
-	NumberMin           int    `mapstructure:"min"`
-	NumberMax           int    `mapstructure:"max"`
-	IgnoreCalls         bool   `mapstructure:"ignore-calls"`
+	IgnoreStringValues   []string `mapstructure:"ignore-string-values"`
+	MatchWithConstants   bool     `mapstructure:"match-constant"`
+	MinStringLen         int      `mapstructure:"min-len"`
+	MinOccurrencesCount  int      `mapstructure:"min-occurrences"`
+	ParseNumbers         bool     `mapstructure:"numbers"`
+	NumberMin            int      `mapstructure:"min"`
+	NumberMax            int      `mapstructure:"max"`
+	IgnoreCalls          bool     `mapstructure:"ignore-calls"`
+	FindDuplicates       bool     `mapstructure:"find-duplicates"`
+	EvalConstExpressions bool     `mapstructure:"eval-const-expressions"`
+
+	// Deprecated: use IgnoreStringValues instead.
+	IgnoreStrings string `mapstructure:"ignore-strings"`
 }
 
 type GoCriticSettings struct {

pkg/config/linters_settings.go

@@ -190,8 +190,15 @@ func (l *Loader) handleDeprecation() error {
 	return nil
 }
 
-func (*Loader) handleLinterOptionDeprecations() {
-	// The function is empty but deprecations will happen in the future.
+func (l *Loader) handleLinterOptionDeprecations() {
+	// Deprecated since v2.1.0.
+	if l.cfg.Linters.Settings.Goconst.IgnoreStrings != "" {
+		l.log.Warnf("The configuration option `linters.settings.goconst.ignore-strings` is deprecated, " +
+			"please use `linters.settings.goconst.ignore-string-values`.")
+
+		l.cfg.Linters.Settings.Goconst.IgnoreStringValues = append(l.cfg.Linters.Settings.Goconst.IgnoreStringValues,
+			l.cfg.Linters.Settings.Goconst.IgnoreStrings)
+	}
 }
 
 func (l *Loader) handleEnableOnlyOption() error {