feat: integrate gofump

Signed-off-by: Ilya Lesikov <ilya@lesikov.com>

Author: ilya-lesikov

README.md

@@ -1,6 +1,6 @@
 # Wormatter
 
-A DST-based Go source code formatter that enforces a specific declaration ordering and formatting style.
+A DST-based Go source code formatter. Highly opinionated, but very comprehensive. Gofumpt built-in.
 
 ## Installation
 

Taskfile.yaml

@@ -28,13 +28,6 @@ tasks:
     cmds:
       - go test -v ./...
 
-  format:
-    desc: Format all Go files using wormatter itself
-    deps: [build]
-    cmds:
-      - ./bin/{{.BINARY_NAME}} ./cmd
-      - ./bin/{{.BINARY_NAME}} ./pkg
-
   clean:
     desc: Remove build artifacts
     cmds:

go.mod

@@ -5,13 +5,15 @@ go 1.25
 require (
 	github.com/dave/dst v0.27.3
 	github.com/samber/lo v1.52.0
+	golang.org/x/mod v0.31.0
 	gonum.org/v1/gonum v0.16.0
+	mvdan.cc/gofumpt v0.9.2
 )
 
 require (
+	github.com/google/go-cmp v0.7.0 // indirect
 	github.com/sergi/go-diff v1.4.0 // indirect
-	golang.org/x/mod v0.21.0 // indirect
-	golang.org/x/sync v0.12.0 // indirect
+	golang.org/x/sync v0.18.0 // indirect
 	golang.org/x/text v0.23.0 // indirect
-	golang.org/x/tools v0.26.0 // indirect
+	golang.org/x/tools v0.39.0 // indirect
 )

go.sum

@@ -4,27 +4,39 @@ github.com/dave/jennifer v1.5.0 h1:HmgPN93bVDpkQyYbqhCHj5QlgvUkvEOzMyEvKLgCRrg=
 github.com/dave/jennifer v1.5.0/go.mod h1:4MnyiFIlZS3l5tSDn8VnzE6ffAhYBMB2SZntBsZGUok=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/go-quicktest/qt v1.101.0 h1:O1K29Txy5P2OK0dGo59b7b0LR6wKfIhttaAhHUyn7eI=
+github.com/go-quicktest/qt v1.101.0/go.mod h1:14Bz/f7NwaXPtdYEgzsx46kqSxVwTbzVZsDC26tQJow=
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
+github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
 github.com/samber/lo v1.52.0 h1:Rvi+3BFHES3A8meP33VPAxiBZX/Aws5RxrschYGjomw=
 github.com/samber/lo v1.52.0/go.mod h1:4+MXEGsJzbKGaUEQFKBq2xtfuznW9oz/WrgyzMzRoM0=
 github.com/sergi/go-diff v1.4.0 h1:n/SP9D5ad1fORl+llWyN+D6qoUETXNZARKjyY2/KVCw=
 github.com/sergi/go-diff v1.4.0/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0=
-golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
-golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=
-golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+golang.org/x/mod v0.31.0 h1:HaW9xtz0+kOcWKwli0ZXy79Ix+UW/vOfmWI5QVd2tgI=
+golang.org/x/mod v0.31.0/go.mod h1:43JraMp9cGx1Rx3AqioxrbrhNsLl2l/iNAvuBkrezpg=
+golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I=
+golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
 golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
 golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
-golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ=
-golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0=
+golang.org/x/tools v0.39.0 h1:ik4ho21kwuQln40uelmciQPp9SipgNDdrafrYA4TmQQ=
+golang.org/x/tools v0.39.0/go.mod h1:JnefbkDPyD8UU2kI5fuf8ZX4/yUeh9W877ZeBONxUqQ=
 gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
 gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
+mvdan.cc/gofumpt v0.9.2 h1:zsEMWL8SVKGHNztrx6uZrXdp7AX8r421Vvp23sz7ik4=
+mvdan.cc/gofumpt v0.9.2/go.mod h1:iB7Hn+ai8lPvofHd9ZFGVg2GOr8sBUw1QUWjNbmIL/s=

pkg/formatter/formatter.go

@@ -14,8 +14,10 @@ import (
 	"github.com/dave/dst"
 	"github.com/dave/dst/decorator"
 	"github.com/samber/lo"
+	"golang.org/x/mod/modfile"
 	"gonum.org/v1/gonum/graph/simple"
 	"gonum.org/v1/gonum/graph/topo"
+	"mvdan.cc/gofumpt/format"
 )
 
 type declCollector struct {
@@ -164,7 +166,15 @@ func FormatFile(filePath string) error {
 		return err
 	}
 
-	return os.WriteFile(filePath, buf.Bytes(), 0644)
+	formatted, err := format.Source(buf.Bytes(), format.Options{
+		LangVersion: detectGoVersion(filePath),
+		ExtraRules:  true,
+	})
+	if err != nil {
+		return err
+	}
+
+	return os.WriteFile(filePath, formatted, 0644)
 }
 
 func reorderDeclarations(f *dst.File) []dst.Decl {
@@ -825,6 +835,24 @@ func buildCallGraph(funcs []*dst.FuncDecl, localFuncs map[string]bool) map[strin
 	return graph
 }
 
+func detectGoVersion(filePath string) string {
+	dir := filepath.Dir(filePath)
+	for {
+		goModPath := filepath.Join(dir, "go.mod")
+		if data, err := os.ReadFile(goModPath); err == nil {
+			if mf, err := modfile.Parse(goModPath, data, nil); err == nil && mf.Go != nil {
+				return "go" + mf.Go.Version
+			}
+		}
+		parent := filepath.Dir(dir)
+		if parent == dir {
+			break
+		}
+		dir = parent
+	}
+	return ""
+}
+
 func containsIota(expr dst.Expr) bool {
 	switch e := expr.(type) {
 	case *dst.Ident:

pkg/formatter/testdata/expected.go

@@ -80,21 +80,23 @@ func NewServer() *Server {
 }
 
 func NewServerWithOptions(host string, port int) *Server {
-	return &Server{Host: host, port: port}
+	return &Server{
+		Host: host, port: port,
+	}
 }
 
-func (s *Server) PublicMethod() {}
-
 func (s *Server) AnotherPublic() {
 	fmt.Println("another")
 }
 
+func (s *Server) PublicMethod() {}
+
+func (s *Server) handleRequest() {}
+
 func (s *Server) privateMethod() {
 	return
 }
 
-func (s *Server) handleRequest() {}
-
 type Client struct {
 	URL string
 
@@ -132,7 +134,9 @@ func NewConfig() Config {
 }
 
 func NewConfigWithDefaults() *Config {
-	return &Config{Timeout: 30, Verbose: true, debug: false, name: "default"}
+	return &Config{
+		Timeout: 30, Verbose: true, debug: false, name: "default",
+	}
 }
 
 type Empty struct{}
@@ -173,16 +177,23 @@ func ProcessDataPublic(data string) string {
 	return strings.ToLower(data)
 }
 
-func helperLower() {
-	fmt.Println("helper")
+func createMixed() *Mixed {
+	return &Mixed{
+		Address: "addr", Name: "test", age: 25, count: 1,
+	}
 }
 
-func processData(data string) string {
-	return strings.ToUpper(data)
+func functionWithEarlyReturn(x int) int {
+	if x < 0 {
+		return 0
+	}
+	y := x * 2
+
+	return y
 }
 
-func createMixed() *Mixed {
-	return &Mixed{Address: "addr", Name: "test", age: 25, count: 1}
+func functionWithOnlyReturn() int {
+	return 42
 }
 
 func functionWithReturn() int {
@@ -192,17 +203,12 @@ func functionWithReturn() int {
 	return x + y
 }
 
-func functionWithEarlyReturn(x int) int {
-	if x < 0 {
-		return 0
-	}
-	y := x * 2
-
-	return y
+func helperLower() {
+	fmt.Println("helper")
 }
 
-func functionWithOnlyReturn() int {
-	return 42
+func processData(data string) string {
+	return strings.ToUpper(data)
 }
 
 func standaloneHelper() {}