feat(format): update format

Author: jaronnie

go.mod

@@ -6,6 +6,7 @@ require (
 	github.com/Masterminds/sprig/v3 v3.3.0
 	github.com/a8m/envsubst v1.4.2
 	github.com/dave/dst v0.27.3
+	github.com/fsgo/go_fmt v0.6.3
 	github.com/go-git/go-git/v5 v5.13.2
 	github.com/golang-migrate/migrate/v4 v4.18.2
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1
@@ -62,6 +63,7 @@ require (
 	github.com/go-sql-driver/mysql v1.9.0 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/gookit/color v1.5.4 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect

go.sum

@@ -72,6 +72,10 @@ github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2
 github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
 github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
 github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
+github.com/fsgo/fst v0.0.5 h1:c12J39shorNiS3X9QsK6sg/KUzw8FOA3IoKPb/upj7E=
+github.com/fsgo/fst v0.0.5/go.mod h1:vNB0la0LICDwsMuwD7KR8NNDnslYyH/1x1+fOamXra8=
+github.com/fsgo/go_fmt v0.6.3 h1:JFm6d78v9MxqRk5KmvFK/a1djqyS2lhBYCgYc7pBYBw=
+github.com/fsgo/go_fmt v0.6.3/go.mod h1:4fGqOpLBa2PNg8L3x4X/ojg92bejdJ8Y0oRKf/dWNVc=
 github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M=
 github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
 github.com/gliderlabs/ssh v0.3.8 h1:a4YXD1V7xMF9g5nTkdfnja3Sxy1PVDCj1Zg4Wb8vY6c=

internal/format/formatgo/run.go

@@ -4,33 +4,27 @@ import (
 	"bufio"
 	"os"
 	"regexp"
-	"strings"
 
-	"github.com/zeromicro/go-zero/core/logx"
+	"github.com/fsgo/go_fmt/gofmtapi"
 	"github.com/zeromicro/go-zero/core/mr"
-	"github.com/zeromicro/go-zero/tools/goctl/pkg/golang"
-	"github.com/zeromicro/go-zero/tools/goctl/util/console"
-	"github.com/zeromicro/go-zero/tools/goctl/util/env"
 
 	"github.com/jzero-io/jzero/config"
-	"github.com/jzero-io/jzero/pkg"
 	"github.com/jzero-io/jzero/pkg/gitstatus"
 )
 
-/*
-	Use gofumpt to format go code
-*/
-
 var rxCodeGenerated = regexp.MustCompile(`^// Code generated .* DO NOT EDIT\.$`)
 
 func Run() error {
-	check()
-
 	files := getFormatFiles()
 
 	files = filterFiles(files)
 
-	return execFormat(files)
+	gf := gofmtapi.NewFormatter()
+	opt := gofmtapi.NewOptions()
+	opt.BindFlags()
+
+	opt.Files = files
+	return gf.Execute(opt)
 }
 
 func getFormatFiles() []string {
@@ -40,9 +34,8 @@ func getFormatFiles() []string {
 			return files
 		}
 		return []string{"."}
-	} else {
-		return []string{"."}
 	}
+	return []string{"."}
 }
 
 func filterFiles(files []string) []string {
@@ -62,19 +55,6 @@ func filterFiles(files []string) []string {
 	return result
 }
 
-func execFormat(files []string) error {
-	if len(files) > 0 {
-		args := []string{"gofumpt", "-l", "-w"}
-		args = append(args, files...)
-		logx.Debugf("execute command: %s", strings.Join(args, " "))
-		err := pkg.Run(strings.Join(args, " "), "")
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
 func readFirstLine(filePath string) (string, error) {
 	file, err := os.Open(filePath)
 	if err != nil {
@@ -89,19 +69,3 @@ func readFirstLine(filePath string) (string, error) {
 
 	return "", scanner.Err()
 }
-
-func check() {
-	log := console.NewColorConsole(true)
-
-	// install goctl
-	_, err := env.LookPath("gofumpt")
-	if err != nil {
-		log.Warning(`[jzero-env]: gofumpt is not found in PATH`)
-		if err = golang.Install("go install mvdan.cc/gofumpt@latest"); err != nil {
-			log.Fatalln("[jzero-env]: gofumpt is not installed, please install it by running: go install mvdan.cc/gofumpt@latest")
-		}
-	}
-	if _, err = env.LookPath("gofumpt"); err != nil {
-		log.Fatalln("[jzero-env]: env check failed, gofumpt is not installed")
-	}
-}