build(deps): bump mvdan.cc/gofumpt from 0.9.2 to 0.11.0 (#6687)

Co-authored-by: Fernandez Ludovic <ldez@users.noreply.github.com>

Author: dependabot[bot]

.golangci.next.reference.yml

@@ -4756,6 +4756,19 @@ formatters:
       # Default: ""
       module-path: github.com/org/project
 
+      # Extra formatting rules.
+      extra:
+        # Groups function parameters with repeated types.
+        # Default: false
+        group-params: true
+        # Clothes naked returns in functions with named results.
+        # Default: false
+        clothe-returns: true
+        # Multi-line function calls with the opening parenthesis at the end of a line should place the closing parenthesis at the start of a line.
+        # Default: false
+        balance-calls: true
+
+      # Deprecated: use `extra` instead.
       # Choose whether to use the extra rules.
       # Default: false
       extra-rules: true

.golangci.yml

@@ -239,6 +239,10 @@ linters:
         text: "SA1019: config.ExhaustructSettings is deprecated: use ExhaustructV5Settings instead."
         linters:
           - staticcheck
+      - path: pkg/goformatters/gofumpt/gofumpt.go
+        text: "SA1019: settings.ExtraRules is deprecated: use Extra instead."
+        linters:
+          - staticcheck
       - path: pkg/golinters/gomodguard/
         linters:
           - dupl

go.mod

@@ -157,7 +157,7 @@ require (
 	golang.org/x/sys v0.47.0
 	golang.org/x/tools v0.48.0
 	honnef.co/go/tools v0.7.0
-	mvdan.cc/gofumpt v0.9.2
+	mvdan.cc/gofumpt v0.11.0
 	mvdan.cc/unparam v0.0.0-20251027182757-5beb8c8f8f15
 )
 

go.sum

@@ -2240,6 +2240,24 @@
             "module-path": {
               "description": " Module path which contains the source code being formatted.",
               "type": "string"
+            },
+            "extra": {
+              "type": "object",
+              "additionalProperties": false,
+              "properties": {
+                "group-params": {
+                  "type": "boolean",
+                  "default": false
+                },
+                "clothe-returns": {
+                  "type": "boolean",
+                  "default": false
+                },
+                "balance-calls": {
+                  "type": "boolean",
+                  "default": false
+                }
+              }
             }
           }
         },

jsonschema/golangci.next.jsonschema.json

@@ -42,12 +42,21 @@ type GoFmtRewriteRule struct {
 }
 
 type GoFumptSettings struct {
-	ModulePath string `mapstructure:"module-path"`
-	ExtraRules bool   `mapstructure:"extra-rules"`
+	ModulePath string       `mapstructure:"module-path"`
+	Extra      GoFumptExtra `mapstructure:"extra"`
+
+	// Deprecated: use Extra instead.
+	ExtraRules bool `mapstructure:"extra-rules"`
 
 	LangVersion string `mapstructure:"-"`
 }
 
+type GoFumptExtra struct {
+	GroupParams   bool `mapstructure:"group-params"`
+	ClotheReturns bool `mapstructure:"clothe-returns"`
+	BalanceCalls  bool `mapstructure:"balance-calls"`
+}
+
 type GoImportsSettings struct {
 	LocalPrefixes []string `mapstructure:"local-prefixes"`
 }

pkg/config/formatters_settings.go

@@ -6,6 +6,7 @@ import (
 	gofumpt "mvdan.cc/gofumpt/format"
 
 	"github.com/golangci/golangci-lint/v2/pkg/config"
+	"github.com/golangci/golangci-lint/v2/pkg/goformatters/internal"
 )
 
 const Name = "gofumpt"
@@ -18,10 +19,19 @@ func New(settings *config.GoFumptSettings, goVersion string) *Formatter {
 	var options gofumpt.Options
 
 	if settings != nil {
+		if settings.ExtraRules {
+			internal.FormatterLogger.Warnf("gofumpt: `extra-rules` is deprecated, please use `extra.group-params` instead.")
+		}
+
 		options = gofumpt.Options{
 			LangVersion: getLangVersion(goVersion),
 			ModulePath:  settings.ModulePath,
 			ExtraRules:  settings.ExtraRules,
+			Extra: gofumpt.Extra{
+				GroupParams:   settings.Extra.GroupParams,
+				ClotheReturns: settings.Extra.ClotheReturns,
+				BalanceCalls:  settings.Extra.BalanceCalls,
+			},
 		}
 	}
 

pkg/goformatters/gofumpt/gofumpt.go

@@ -3,6 +3,10 @@ package testdata
 
 import "fmt"
 
-func GofmtNotExtra(bar string, baz string) { // want "File is not properly formatted"
+func GroupedType(bar string, baz string) { // want "File is not properly formatted"
 	fmt.Print("foo")
 }
+
+func RakedReturns() (err error) {
+	return
+}

pkg/golinters/gofumpt/testdata/gofumpt_with_extra.go

@@ -5,4 +5,6 @@ formatters:
     - gofumpt
   settings:
     gofumpt:
-      extra-rules: true
+      extra:
+        group-params: true
+        clothe-returns: true