From 0fe129de6593621fa44e6a0d973b380f7602c55d Mon Sep 17 00:00:00 2001
From: Loyalsoldier <10487845+Loyalsoldier@users.noreply.github.com>
Date: Sat, 1 May 2021 11:11:37 +0800
Subject: [PATCH] Infra: use customized goimports (#949)

---
 format.go             | 2 +-
 infra/vformat/main.go | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/format.go b/format.go
index 27511d382..ed0171462 100644
--- a/format.go
+++ b/format.go
@@ -1,4 +1,4 @@
 package core
 
-//go:generate go install -v golang.org/x/tools/cmd/goimports@latest
+//go:generate go install -v github.com/v2fly/tools/cmd/goimports@latest
 //go:generate go run ./infra/vformat/
diff --git a/infra/vformat/main.go b/infra/vformat/main.go
index ddd979f14..4bf70537d 100644
--- a/infra/vformat/main.go
+++ b/infra/vformat/main.go
@@ -154,7 +154,8 @@ func main() {
 		filename := filepath.Base(path)
 		if strings.HasSuffix(filename, ".go") &&
 			!strings.HasSuffix(filename, ".pb.go") &&
-			!strings.Contains(dir, filepath.Join("testing", "mocks")) {
+			!strings.Contains(dir, filepath.Join("testing", "mocks")) &&
+			!strings.Contains(path, filepath.Join("main", "distro", "all", "all.go")) {
 			rawFilesSlice = append(rawFilesSlice, path)
 		}
 
@@ -171,6 +172,7 @@ func main() {
 
 	goimportsArgs := []string{
 		"-w",
+		"-r",
 		"-local", "github.com/v2fly/v2ray-core",
 	}