Style: use gofumpt for fmt

.github/workflows/go.yml

@@ -30,9 +30,8 @@ jobs:
       - name: Get dependencies, run test and static check
         run: |
           go test ./...
-          go vet ./...
+          go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest
-          go install honnef.co/go/tools/cmd/staticcheck@latest
+          golangci-lint run --disable-all -E govet -E gofumpt -E megacheck ./...
-          staticcheck -- $(go list ./...)
 
       - name: Build
         if: startsWith(github.ref, 'refs/tags/')

Makefile

@@ -112,5 +112,9 @@ $(zip_releases): %.zip : %
 all-arch: $(PLATFORM_LIST) $(WINDOWS_ARCH_LIST)
 
 releases: $(gz_releases) $(zip_releases)
+
+lint:
+	golangci-lint run --disable-all -E govet -E gofumpt -E megacheck ./...
+
 clean:
 	rm $(BINDIR)/*

adapter/provider/fetcher.go

@@ -12,8 +12,8 @@ import (
 )
 
 var (
-	fileMode os.FileMode = 0666
+	fileMode os.FileMode = 0o666
-	dirMode  os.FileMode = 0755
+	dirMode  os.FileMode = 0o755
 )
 
 type parser = func([]byte) (interface{}, error)

adapter/provider/parser.go

@@ -10,9 +10,7 @@ import (
 	types "github.com/Dreamacro/clash/constant/provider"
 )
 
-var (
+var errVehicleType = errors.New("unsupport vehicle type")
-	errVehicleType = errors.New("unsupport vehicle type")
-)
 
 type healthCheckSchema struct {
 	Enable   bool   `provider:"enable"`

common/cache/lrucache_test.go

@@ -149,7 +149,6 @@ func TestSetWithExpire(t *testing.T) {
 	assert.Equal(t, nil, res)
 	assert.Equal(t, time.Time{}, expires)
 	assert.Equal(t, false, exist)
-
 }
 
 func TestStale(t *testing.T) {

common/murmur3/murmur32.go

@@ -67,7 +67,6 @@ func (d *digest32) bmix(p []byte) (tail []byte) {
 }
 
 func (d *digest32) Sum32() (h1 uint32) {
-
 	h1 = d.h1
 
 	var k1 uint32

common/observable/observable_test.go

@@ -38,7 +38,7 @@ func TestObservable_MultiSubscribe(t *testing.T) {
 	src := NewObservable(iter)
 	ch1, _ := src.Subscribe()
 	ch2, _ := src.Subscribe()
-	var count = atomic.NewInt32(0)
+	count := atomic.NewInt32(0)
 
 	var wg sync.WaitGroup
 	wg.Add(2)

common/pool/alloc.go

@@ -53,6 +53,7 @@ func (alloc *Allocator) Put(buf []byte) error {
 	}
 
 	//lint:ignore SA6002 ignore temporarily
+	//nolint
 	alloc.buffers[bits].Put(buf)
 	return nil
 }

common/singledo/singledo_test.go

@@ -12,7 +12,7 @@ import (
 func TestBasic(t *testing.T) {
 	single := NewSingle(time.Millisecond * 30)
 	foo := 0
-	var shardCount = atomic.NewInt32(0)
+	shardCount := atomic.NewInt32(0)
 	call := func() (interface{}, error) {
 		foo++
 		time.Sleep(time.Millisecond * 5)

common/structure/structure_test.go

@@ -5,8 +5,10 @@ import (
 	"testing"
 )
 
-var decoder = NewDecoder(Option{TagName: "test"})
+var (
-var weakTypeDecoder = NewDecoder(Option{TagName: "test", WeaklyTypedInput: true})
+	decoder         = NewDecoder(Option{TagName: "test"})
+	weakTypeDecoder = NewDecoder(Option{TagName: "test", WeaklyTypedInput: true})
+)
 
 type Baz struct {
 	Foo int    `test:"foo"`

component/dialer/options.go

@@ -1,8 +1,6 @@
 package dialer
 
-var (
+var DefaultOptions []Option
-	DefaultOptions []Option
-)
 
 type config struct {
 	skipDefault   bool

component/iface/iface.go

@@ -15,8 +15,10 @@ type Interface struct {
 	HardwareAddr net.HardwareAddr
 }
 
-var ErrIfaceNotFound = errors.New("interface not found")
+var (
-var ErrAddrNotFound = errors.New("addr not found")
+	ErrIfaceNotFound = errors.New("interface not found")
+	ErrAddrNotFound  = errors.New("addr not found")
+)
 
 var interfaces = singledo.NewSingle(time.Second * 20)
 

component/mmdb/mmdb.go

@@ -9,8 +9,10 @@ import (
 	"github.com/oschwald/geoip2-golang"
 )
 
-var mmdb *geoip2.Reader
+var (
-var once sync.Once
+	mmdb *geoip2.Reader
+	once sync.Once
+)
 
 func LoadFromBytes(buffer []byte) {
 	once.Do(func() {

component/process/process_linux.go

@@ -25,8 +25,10 @@ var nativeEndian = func() binary.ByteOrder {
 	return binary.LittleEndian
 }()
 
-type SocketResolver func(network string, ip net.IP, srcPort int) (inode, uid int, err error)
+type (
-type ProcessNameResolver func(inode, uid int) (name string, err error)
+	SocketResolver      func(network string, ip net.IP, srcPort int) (inode, uid int, err error)
+	ProcessNameResolver func(inode, uid int) (name string, err error)
+)
 
 // export for android
 var (

component/profile/cachefile/cache.go

@@ -16,7 +16,7 @@ import (
 
 var (
 	initOnce     sync.Once
-	fileMode     os.FileMode = 0666
+	fileMode     os.FileMode = 0o666
 	defaultCache *CacheFile
 
 	bucketSelected = []byte("selected")
@@ -41,7 +41,6 @@ func (c *CacheFile) SetSelected(group, selected string) {
 		}
 		return bucket.Put([]byte(group), []byte(selected))
 	})
-
 	if err != nil {
 		log.Warnln("[CacheFile] write cache to %s failed: %s", c.db.Path(), err.Error())
 		return

component/profile/profile.go

@@ -4,7 +4,5 @@ import (
 	"go.uber.org/atomic"
 )
 
-var (
+// StoreSelected is a global switch for storing selected proxy to cache
-	// StoreSelected is a global switch for storing selected proxy to cache
+var StoreSelected = atomic.NewBool(true)
-	StoreSelected = atomic.NewBool(true)
-)

component/trie/domain.go

@@ -12,10 +12,8 @@ const (
 	domainStep      = "."
 )
 
-var (
+// ErrInvalidDomain means insert domain is invalid
-	// ErrInvalidDomain means insert domain is invalid
+var ErrInvalidDomain = errors.New("invalid domain")
-	ErrInvalidDomain = errors.New("invalid domain")
-)
 
 // DomainTrie contains the main logic for adding and searching nodes for domain segments.
 // support wildcard domain (e.g *.google.com)

config/initial.go

@@ -18,7 +18,7 @@ func downloadMMDB(path string) (err error) {
 	}
 	defer resp.Body.Close()
 
-	f, err := os.OpenFile(path, os.O_CREATE|os.O_WRONLY, 0644)
+	f, err := os.OpenFile(path, os.O_CREATE|os.O_WRONLY, 0o644)
 	if err != nil {
 		return err
 	}
@@ -54,7 +54,7 @@ func initMMDB() error {
 func Init(dir string) error {
 	// initial homedir
 	if _, err := os.Stat(dir); os.IsNotExist(err) {
-		if err := os.MkdirAll(dir, 0777); err != nil {
+		if err := os.MkdirAll(dir, 0o777); err != nil {
 			return fmt.Errorf("can't create config directory %s: %s", dir, err.Error())
 		}
 	}
@@ -62,7 +62,7 @@ func Init(dir string) error {
 	// initial config.yaml
 	if _, err := os.Stat(C.Path.Config()); os.IsNotExist(err) {
 		log.Infoln("Can't find config, create a initial config file")
-		f, err := os.OpenFile(C.Path.Config(), os.O_CREATE|os.O_WRONLY, 0644)
+		f, err := os.OpenFile(C.Path.Config(), os.O_CREATE|os.O_WRONLY, 0o644)
 		if err != nil {
 			return fmt.Errorf("can't create file %s: %s", C.Path.Config(), err.Error())
 		}

dns/filters.go

@@ -32,6 +32,7 @@ func (inf *ipnetFilter) Match(ip net.IP) bool {
 type fallbackDomainFilter interface {
 	Match(domain string) bool
 }
+
 type domainFilter struct {
 	tree *trie.DomainTrie
 }

dns/middleware.go

@@ -14,8 +14,10 @@ import (
 	D "github.com/miekg/dns"
 )
 
-type handler func(ctx *context.DNSContext, r *D.Msg) (*D.Msg, error)
+type (
-type middleware func(next handler) handler
+	handler    func(ctx *context.DNSContext, r *D.Msg) (*D.Msg, error)
+	middleware func(next handler) handler
+)
 
 func withHosts(hosts *trie.DomainTrie) middleware {
 	return func(next handler) handler {

dns/resolver.go

@@ -215,7 +215,6 @@ func (r *Resolver) shouldOnlyQueryFallback(m *D.Msg) bool {
 }
 
 func (r *Resolver) ipExchange(ctx context.Context, m *D.Msg) (msg *D.Msg, err error) {
-
 	if matched := r.matchPolicy(m); len(matched) != 0 {
 		res := <-r.asyncExchange(ctx, matched, m)
 		return res.Msg, res.Error

dns/util.go

@@ -13,14 +13,12 @@ import (
 	D "github.com/miekg/dns"
 )
 
-var (
+// EnhancedModeMapping is a mapping for EnhancedMode enum
-	// EnhancedModeMapping is a mapping for EnhancedMode enum
+var EnhancedModeMapping = map[string]EnhancedMode{
-	EnhancedModeMapping = map[string]EnhancedMode{
+	NORMAL.String():  NORMAL,
-		NORMAL.String():  NORMAL,
+	FAKEIP.String():  FAKEIP,
-		FAKEIP.String():  FAKEIP,
+	MAPPING.String(): MAPPING,
-		MAPPING.String(): MAPPING,
+}
-	}
-)
 
 const (
 	NORMAL EnhancedMode = iota

hub/executor/executor.go

@@ -24,9 +24,7 @@ import (
 	"github.com/Dreamacro/clash/tunnel"
 )
 
-var (
+var mux sync.Mutex
-	mux sync.Mutex
-)
 
 func readConfig(path string) ([]byte, error) {
 	if _, err := os.Stat(path); os.IsNotExist(err) {

listener/auth/auth.go

@@ -4,9 +4,7 @@ import (
 	"github.com/Dreamacro/clash/component/auth"
 )
 
-var (
+var authenticator auth.Authenticator
-	authenticator auth.Authenticator
-)
 
 func Authenticator() auth.Authenticator {
 	return authenticator

log/level.go

@@ -5,16 +5,14 @@ import (
 	"errors"
 )
 
-var (
+// LogLevelMapping is a mapping for LogLevel enum
-	// LogLevelMapping is a mapping for LogLevel enum
+var LogLevelMapping = map[string]LogLevel{
-	LogLevelMapping = map[string]LogLevel{
+	ERROR.String():   ERROR,
-		ERROR.String():   ERROR,
+	WARNING.String(): WARNING,
-		WARNING.String(): WARNING,
+	INFO.String():    INFO,
-		INFO.String():    INFO,
+	DEBUG.String():   DEBUG,
-		DEBUG.String():   DEBUG,
+	SILENT.String():  SILENT,
-		SILENT.String():  SILENT,
+}
-	}
-)
 
 const (
 	DEBUG LogLevel = iota

transport/gun/gun.go

@@ -27,12 +27,10 @@ var (
 	ErrSmallBuffer   = errors.New("buffer too small")
 )
 
-var (
+var defaultHeader = http.Header{
-	defaultHeader = http.Header{
+	"content-type": []string{"application/grpc"},
-		"content-type": []string{"application/grpc"},
+	"user-agent":   []string{"grpc-go/1.36.0"},
-		"user-agent":   []string{"grpc-go/1.36.0"},
+}
-	}
-)
 
 type DialFn = func(network, addr string) (net.Conn, error)
 

transport/simple-obfs/tls.go

@@ -78,6 +78,7 @@ func (to *TLSObfs) Read(b []byte) (int, error) {
 	// type + ver = 3
 	return to.read(b, 3)
 }
+
 func (to *TLSObfs) Write(b []byte) (int, error) {
 	length := len(b)
 	for i := 0; i < length; i += chunkSize {

transport/snell/cipher.go

@@ -20,6 +20,7 @@ func (sc *snellCipher) SaltSize() int { return 16 }
 func (sc *snellCipher) Encrypter(salt []byte) (cipher.AEAD, error) {
 	return sc.makeAEAD(snellKDF(sc.psk, salt, sc.KeySize()))
 }
+
 func (sc *snellCipher) Decrypter(salt []byte) (cipher.AEAD, error) {
 	return sc.makeAEAD(snellKDF(sc.psk, salt, sc.KeySize()))
 }

transport/snell/snell.go

@@ -30,9 +30,7 @@ const (
 	Version byte = 1
 )
 
-var (
+var endSignal = []byte{}
-	endSignal = []byte{}
-)
 
 type Snell struct {
 	net.Conn

transport/socks4/socks4.go

@@ -184,7 +184,7 @@ func isReservedIP(ip net.IP) bool {
 }
 
 func readUntilNull(r io.Reader) ([]byte, error) {
-	var buf = &bytes.Buffer{}
+	buf := &bytes.Buffer{}
 	var data [1]byte
 
 	for {

transport/ssr/protocol/auth_aes128_sha1.go

@@ -14,8 +14,10 @@ import (
 	"github.com/Dreamacro/clash/transport/ssr/tools"
 )
 
-type hmacMethod func(key, data []byte) []byte
+type (
-type hashDigestMethod func([]byte) []byte
+	hmacMethod       func(key, data []byte) []byte
+	hashDigestMethod func([]byte) []byte
+)
 
 func init() {
 	register("auth_aes128_sha1", newAuthAES128SHA1, 9)

transport/vmess/header.go

@@ -92,7 +92,7 @@ func sealVMessAEADHeader(key [16]byte, data []byte, t time.Time) []byte {
 		payloadHeaderAEADEncrypted = payloadHeaderAEAD.Seal(nil, payloadHeaderAEADNonce, data, generatedAuthID[:])
 	}
 
-	var outputBuffer = &bytes.Buffer{}
+	outputBuffer := &bytes.Buffer{}
 
 	outputBuffer.Write(generatedAuthID[:])
 	outputBuffer.Write(payloadHeaderLengthAEADEncrypted)

transport/vmess/websocket.go

@@ -28,6 +28,7 @@ type websocketConn struct {
 	rMux sync.Mutex
 	wMux sync.Mutex
 }
+
 type websocketWithEarlyDataConn struct {
 	net.Conn
 	underlay net.Conn

tunnel/mode.go

@@ -8,14 +8,12 @@ import (
 
 type TunnelMode int
 
-var (
+// ModeMapping is a mapping for Mode enum
-	// ModeMapping is a mapping for Mode enum
+var ModeMapping = map[string]TunnelMode{
-	ModeMapping = map[string]TunnelMode{
+	Global.String(): Global,
-		Global.String(): Global,
+	Rule.String():   Rule,
-		Rule.String():   Rule,
+	Direct.String(): Direct,
-		Direct.String(): Direct,
+}
-	}
-)
 
 const (
 	Global TunnelMode = iota