From baf792b0612a54d4212e4a73fa3c382433af516f Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Fri, 17 Apr 2026 22:38:13 +0000
Subject: [PATCH] Use `golangci-lint fmt` to format code (#178)

Use `golangci-lint fmt` to format code, replacing the previous gofumpt-based formatter. https://github.com/daixiang0/gci is used to order the imports.

Mirrors https://github.com/go-gitea/gitea/pull/37194.

---
This PR was written with the help of Claude Opus 4.7

Reviewed-on: https://gitea.com/gitea/gitea-mcp/pulls/178
Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: silverwind <me@silverwind.io>
Co-committed-by: silverwind <me@silverwind.io>
---
 .golangci.yml                          |  9 ++++++++-
 Makefile                               | 14 +++++++++++---
 operation/issue/issue_test.go          |  1 +
 operation/pull/pull_test.go            |  1 +
 operation/timetracking/timetracking.go |  2 +-
 pkg/gitea/gitea.go                     |  3 ++-
 pkg/log/log.go                         |  1 +
 pkg/to/to.go                           |  1 +
 pkg/tool/tool.go                       |  1 +
 9 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index 4d035c7..8fc98cd 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -102,9 +102,16 @@ issues:
   max-same-issues: 0
 formatters:
   enable:
-    - gofmt
+    - gci
     - gofumpt
   settings:
+    gci:
+      custom-order: true
+      sections:
+        - standard
+        - prefix(gitea.com/gitea/gitea-mcp)
+        - blank
+        - default
     gofumpt:
       extra-rules: true
   exclusions:
diff --git a/Makefile b/Makefile
index 9edb7b0..cb8484e 100644
--- a/Makefile
+++ b/Makefile
@@ -3,9 +3,8 @@ EXECUTABLE := gitea-mcp
 VERSION ?= $(shell git describe --tags --always | sed 's/-/+/' | sed 's/^v//')
 LDFLAGS := -X "main.Version=$(VERSION)"
 
-GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.10.1
+GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.11.4
 GOVULNCHECK_PACKAGE ?= golang.org/x/vuln/cmd/govulncheck@v1
-GOFUMPT_PACKAGE ?= mvdan.cc/gofumpt@v0.9.2
 
 .PHONY: help
 help: ## print this help message
@@ -51,7 +50,16 @@ dev: air ## run the application with hot reload
 
 .PHONY: fmt
 fmt: ## format the Go code
-	$(GO) run $(GOFUMPT_PACKAGE) -w .
+	$(GO) run $(GOLANGCI_LINT_PACKAGE) fmt
+
+.PHONY: fmt-check
+fmt-check: fmt ## check that Go code is formatted
+	@diff=$$(git diff --color=always); \
+	if [ -n "$$diff" ]; then \
+		echo "Please run 'make fmt' and commit the result:"; \
+		printf "%s" "$${diff}"; \
+		exit 1; \
+	fi
 
 .PHONY: lint
 lint: lint-go ## lint everything
diff --git a/operation/issue/issue_test.go b/operation/issue/issue_test.go
index 0964357..647feb5 100644
--- a/operation/issue/issue_test.go
+++ b/operation/issue/issue_test.go
@@ -11,6 +11,7 @@ import (
 	"testing"
 
 	"gitea.com/gitea/gitea-mcp/pkg/flag"
+
 	"github.com/mark3labs/mcp-go/mcp"
 )
 
diff --git a/operation/pull/pull_test.go b/operation/pull/pull_test.go
index 71567c6..6a8b56a 100644
--- a/operation/pull/pull_test.go
+++ b/operation/pull/pull_test.go
@@ -10,6 +10,7 @@ import (
 	"testing"
 
 	"gitea.com/gitea/gitea-mcp/pkg/flag"
+
 	"github.com/mark3labs/mcp-go/mcp"
 )
 
diff --git a/operation/timetracking/timetracking.go b/operation/timetracking/timetracking.go
index 8a4aa78..68bbb97 100644
--- a/operation/timetracking/timetracking.go
+++ b/operation/timetracking/timetracking.go
@@ -5,13 +5,13 @@ import (
 	"context"
 	"fmt"
 
-	gitea_sdk "code.gitea.io/sdk/gitea"
 	"gitea.com/gitea/gitea-mcp/pkg/gitea"
 	"gitea.com/gitea/gitea-mcp/pkg/log"
 	"gitea.com/gitea/gitea-mcp/pkg/params"
 	"gitea.com/gitea/gitea-mcp/pkg/to"
 	"gitea.com/gitea/gitea-mcp/pkg/tool"
 
+	gitea_sdk "code.gitea.io/sdk/gitea"
 	"github.com/mark3labs/mcp-go/mcp"
 	"github.com/mark3labs/mcp-go/server"
 )
diff --git a/pkg/gitea/gitea.go b/pkg/gitea/gitea.go
index a3adf4f..32c6716 100644
--- a/pkg/gitea/gitea.go
+++ b/pkg/gitea/gitea.go
@@ -7,9 +7,10 @@ import (
 	"fmt"
 	"net/http"
 
-	"code.gitea.io/sdk/gitea"
 	mcpContext "gitea.com/gitea/gitea-mcp/pkg/context"
 	"gitea.com/gitea/gitea-mcp/pkg/flag"
+
+	"code.gitea.io/sdk/gitea"
 )
 
 func NewClient(token string) (*gitea.Client, error) {
diff --git a/pkg/log/log.go b/pkg/log/log.go
index caeb4bb..e4c82a9 100644
--- a/pkg/log/log.go
+++ b/pkg/log/log.go
@@ -6,6 +6,7 @@ import (
 	"time"
 
 	"gitea.com/gitea/gitea-mcp/pkg/flag"
+
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 	"gopkg.in/natefinch/lumberjack.v2"
diff --git a/pkg/to/to.go b/pkg/to/to.go
index 412d98f..682404e 100644
--- a/pkg/to/to.go
+++ b/pkg/to/to.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 
 	"gitea.com/gitea/gitea-mcp/pkg/log"
+
 	"github.com/mark3labs/mcp-go/mcp"
 )
 
diff --git a/pkg/tool/tool.go b/pkg/tool/tool.go
index c91205e..b137451 100644
--- a/pkg/tool/tool.go
+++ b/pkg/tool/tool.go
@@ -2,6 +2,7 @@ package tool
 
 import (
 	"gitea.com/gitea/gitea-mcp/pkg/flag"
+
 	"github.com/mark3labs/mcp-go/server"
 )