1
0
世界 3 жил өмнө
parent
commit
778992eeb9

+ 1 - 0
core/format.go

@@ -1,4 +1,5 @@
 package core
 
 //go:generate go install -v github.com/daixiang0/gci@latest
+//go:generate go install -v mvdan.cc/gofumpt@latest
 //go:generate go run ../infra/vformat/main.go -pwd ./..

+ 2 - 3
infra/vformat/main.go

@@ -134,7 +134,7 @@ func main() {
 	if runtime.GOOS == "windows" {
 		suffix = ".exe"
 	}
-	gofmt := "gofmt" + suffix
+	gofmt := "gofumpt" + suffix
 	goimports := "gci" + suffix
 
 	if gofmtPath, err := exec.LookPath(gofmt); err != nil {
@@ -183,8 +183,7 @@ func main() {
 	}
 
 	goimportsArgs := []string{
-		"-w",
-		"-local", "github.com/xtls/xray-core",
+		"write",
 	}
 
 	RunMany(gofmt, gofmtArgs, rawFilesSlice)