Skip to content

Commit 4ad3233

Browse files
kwokwo
authored
allow non-URL local package names (#22)
1 parent c177722 commit 4ad3233

File tree

4 files changed

+74
-14
lines changed

4 files changed

+74
-14
lines changed

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ module github.com/daixiang0/gci
22

33
go 1.14
44

5-
require golang.org/x/tools v0.0.0-20200724022722-7017fd6b1305
5+
require golang.org/x/tools v0.0.0-20201118003311-bd56c0adb394

‎go.sum

+11-7
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,24 @@
1-
github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
1+
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
22
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
33
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
44
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
5+
golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4=
56
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
67
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
78
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
8-
golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
9+
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
910
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
10-
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
11+
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
1112
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
1213
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
13-
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
14+
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
1415
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
16+
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
17+
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
1518
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
16-
golang.org/x/tools v0.0.0-20200724022722-7017fd6b1305 h1:yaM5S0KcY0lIoZo7Fl+oi91b/DdlU2zuWpfHrpWbCS0=
17-
golang.org/x/tools v0.0.0-20200724022722-7017fd6b1305/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
19+
golang.org/x/tools v0.0.0-20201118003311-bd56c0adb394 h1:O3VD5Fds21mB1WVRTbkiz/HTXESx6Jql5ucPZi69oiM=
20+
golang.org/x/tools v0.0.0-20201118003311-bd56c0adb394/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
1821
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
1922
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
20-
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
23+
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
24+
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

‎pkg/gci/gci.go

+24-6
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ import (
1010
"path/filepath"
1111
"sort"
1212
"strings"
13+
14+
"golang.org/x/tools/go/packages"
1315
)
1416

1517
const (
@@ -30,8 +32,25 @@ import (
3032
importEndFlag = []byte(`
3133
)
3234
`)
35+
standardPackages = make(map[string]struct{})
3336
)
3437

38+
func init() {
39+
pkgs, err := packages.Load(nil, "std")
40+
if err != nil {
41+
panic(err)
42+
}
43+
44+
for _, p := range pkgs {
45+
standardPackages[p.PkgPath] = struct{}{}
46+
}
47+
}
48+
49+
func isStandardPackage(pkg string) bool {
50+
_, ok := standardPackages[pkg]
51+
return ok
52+
}
53+
3554
type FlagSet struct {
3655
LocalFlag string
3756
DoWrite, DoDiff *bool
@@ -158,17 +177,16 @@ func getPkgInfo(line string, comment bool) (string, string, string) {
158177
}
159178

160179
func getPkgType(line, localFlag string) int {
161-
if !strings.Contains(line, dot) {
162-
return standard
163-
} else if strings.Contains(line, localFlag) {
180+
pkgName := strings.Trim(line, "\"\\`")
181+
if strings.HasPrefix(pkgName, localFlag) {
164182
return local
165-
} else {
166-
return remote
183+
} else if isStandardPackage(pkgName) {
184+
return standard
167185
}
186+
return remote
168187
}
169188

170189
const (
171-
dot = "."
172190
blank = " "
173191
indent = "\t"
174192
linebreak = "\n"

‎pkg/gci/gci_test.go

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
package gci
2+
3+
import (
4+
"fmt"
5+
"testing"
6+
)
7+
8+
func TestGetPkgType(b *testing.T) {
9+
testCases := []struct {
10+
Line string
11+
LocalFlag string
12+
ExpectedResult int
13+
}{
14+
{Line: `"foo/pkg/bar"`, LocalFlag: "foo", ExpectedResult: local},
15+
{Line: `"github.com/foo/bar"`, LocalFlag: "foo", ExpectedResult: remote},
16+
{Line: `"context"`, LocalFlag: "foo", ExpectedResult: standard},
17+
{Line: `"os/signal"`, LocalFlag: "foo", ExpectedResult: standard},
18+
{Line: `"foo/pkg/bar"`, LocalFlag: "bar", ExpectedResult: remote},
19+
{Line: `"github.com/foo/bar"`, LocalFlag: "bar", ExpectedResult: remote},
20+
{Line: `"context"`, LocalFlag: "bar", ExpectedResult: standard},
21+
{Line: `"os/signal"`, LocalFlag: "bar", ExpectedResult: standard},
22+
{Line: `"foo/pkg/bar"`, LocalFlag: "github.com/foo/bar", ExpectedResult: remote},
23+
{Line: `"github.com/foo/bar"`, LocalFlag: "github.com/foo/bar", ExpectedResult: local},
24+
{Line: `"context"`, LocalFlag: "github.com/foo/bar", ExpectedResult: standard},
25+
{Line: `"os/signal"`, LocalFlag: "github.com/foo/bar", ExpectedResult: standard},
26+
}
27+
28+
for _, _tCase := range testCases {
29+
tCase := _tCase
30+
testFn := func(t *testing.T) {
31+
result := getPkgType(tCase.Line, tCase.LocalFlag)
32+
if got, want := result, tCase.ExpectedResult; got != want {
33+
t.Errorf("bad result: %d, expected: %d", got, want)
34+
}
35+
}
36+
b.Run(fmt.Sprintf("%s:%s", tCase.LocalFlag, tCase.Line), testFn)
37+
}
38+
}

0 commit comments

Comments
 (0)