Add gofumpt as an alternative go formatter

gofumpt is a popular alternative formatter for Go that is compatible
with gofmt but stricter.

Author: jelmer

README.md

@@ -29,7 +29,7 @@ It is also inspired by <https://github.com/github/super-linter>.
 | ---------------------- | --------------------- | ---------------- |
 | C / C++                | [clang-format]        | ([#112])         |
 | CSS                    | [Prettier]            |                  |
-| Go                     | [gofmt]               | [golangci-lint]  |
+| Go                     | [gofmt],[gofumpt]     | [golangci-lint]  |
 | HCL (Hashicorp Config) | [terraform] fmt       |                  |
 | HTML                   | [Prettier]            |                  |
 | JSON                   | [Prettier]            |                  |
@@ -61,6 +61,7 @@ It is also inspired by <https://github.com/github/super-linter>.
 [buildifier]: https://github.com/keith/buildifier-prebuilt
 [prettier-plugin-sql]: https://github.com/un-ts/prettier
 [gofmt]: https://pkg.go.dev/cmd/gofmt
+[gofumpt]: https://github.com/mvdan/gofumpt
 [jsonnetfmt]: https://github.com/google/go-jsonnet
 [scalafmt]: https://scalameta.org/scalafmt
 [ruff]: https://docs.astral.sh/ruff/

example/WORKSPACE.bazel

@@ -201,6 +201,7 @@ pinned_maven_install()
 # Use whichever formatter binaries you need:
 load(
     "@aspect_rules_lint//format:repositories.bzl",
+    "fetch_gofumpt",
     "fetch_java_format",
     "fetch_jsonnet",
     "fetch_ktfmt",
@@ -210,6 +211,8 @@ load(
     "fetch_terraform",
 )
 
+fetch_gofumpt()
+
 fetch_pmd()
 
 fetch_jsonnet()

example/WORKSPACE.bzlmod

@@ -5,6 +5,7 @@
 # Needed until Bazel 7 allows MODULE.bazel to directly call repository rules
 load(
     "@aspect_rules_lint//format:repositories.bzl",
+    "fetch_gofumpt",
     "fetch_java_format",
     "fetch_jsonnet",
     "fetch_ktfmt",
@@ -15,6 +16,8 @@ load(
 )
 load("@aspect_rules_lint//lint:ruff.bzl", "fetch_ruff")
 
+fetch_gofumpt()
+
 fetch_pmd()
 
 fetch_jsonnet()

example/tools/BUILD

@@ -83,6 +83,15 @@ alias(
     }),
 )
 
+alias(
+    name = "gofumpt",
+    actual = select({
+        "@io_bazel_rules_go//go/platform:darwin_amd64": "@com_github_mvdan_gofumpt_darwin_amd64//file",
+        "@io_bazel_rules_go//go/platform:darwin_arm64": "@com_github_mvdan_gofumpt_darwin_arm64//file",
+        "@io_bazel_rules_go//go/platform:linux_amd64": "@com_github_mvdan_gofumpt_linux_amd64//file",
+        "@io_bazel_rules_go//go/platform:linux_arm64": "@com_github_mvdan_gofumpt_linux_arm64//file",
+    }),
+)
 alias(
     name = "swiftformat",
     actual = select({
@@ -132,6 +141,7 @@ shellcheck_binary(name = "shellcheck")
 multi_formatter_binary(
     name = "format",
     cc = "@llvm_toolchain_llvm//:bin/clang-format",
+    # Or ":gofumpt" if you want to use gofumpt instead of gofmt
     go = "@go_sdk//:bin/gofmt",
     java = ":java-format",
     javascript = ":prettier",

format/repositories.bzl

@@ -150,3 +150,48 @@ def fetch_swiftformat():
         sha256 = "978eaffdc3716bbc0859aecee0d83875cf3ab8d8725779448f0035309d9ad9f3",
         url = "https://github.com/nicklockwood/SwiftFormat/releases/download/0.49.17/swiftformat.zip",
     )
+
+def fetch_gofumpt():
+    http_file(
+        name = "com_github_mvdan_gofumpt_linux_amd64",
+        downloaded_file_path = "gofumpt",
+        executable = True,
+        sha256 = "759c6ab56bfbf62cafb35944aef1e0104a117e0aebfe44816fd79ef4b28521e4",
+        urls = [
+            "https://cdn.confidential.cloud/constellation/cas/sha256/759c6ab56bfbf62cafb35944aef1e0104a117e0aebfe44816fd79ef4b28521e4",
+            "https://github.com/mvdan/gofumpt/releases/download/v0.5.0/gofumpt_v0.5.0_linux_amd64",
+        ],
+    )
+
+    http_file(
+        name = "com_github_mvdan_gofumpt_linux_arm64",
+        downloaded_file_path = "gofumpt",
+        executable = True,
+        sha256 = "fba20ffd06606c89a500e3cc836408a09e4767e2f117c97724237ae4ecadf82e",
+        urls = [
+            "https://cdn.confidential.cloud/constellation/cas/sha256/fba20ffd06606c89a500e3cc836408a09e4767e2f117c97724237ae4ecadf82e",
+            "https://github.com/mvdan/gofumpt/releases/download/v0.5.0/gofumpt_v0.5.0_linux_arm64",
+        ],
+    )
+
+    http_file(
+        name = "com_github_mvdan_gofumpt_darwin_amd64",
+        downloaded_file_path = "gofumpt",
+        executable = True,
+        sha256 = "870f05a23541aad3d20d208a3ea17606169a240f608ac1cf987426198c14b2ed",
+        urls = [
+            "https://cdn.confidential.cloud/constellation/cas/sha256/870f05a23541aad3d20d208a3ea17606169a240f608ac1cf987426198c14b2ed",
+            "https://github.com/mvdan/gofumpt/releases/download/v0.5.0/gofumpt_v0.5.0_darwin_amd64",
+        ],
+    )
+
+    http_file(
+        name = "com_github_mvdan_gofumpt_darwin_arm64",
+        downloaded_file_path = "gofumpt",
+        executable = True,
+        sha256 = "f2df95d5fad8498ad8eeb0be8abdb8bb8d05e8130b332cb69751dfd090fabac4",
+        urls = [
+            "https://cdn.confidential.cloud/constellation/cas/sha256/f2df95d5fad8498ad8eeb0be8abdb8bb8d05e8130b332cb69751dfd090fabac4",
+            "https://github.com/mvdan/gofumpt/releases/download/v0.5.0/gofumpt_v0.5.0_darwin_arm64",
+        ],
+    )