Revert "remove hardcoded stdlib packages (#138)"

This reverts commit c19c1aa.
daixiang0 · Mar 13, 2023 · 0328396 · 0328396
1 parent b0ea6e8
commit 0328396
Show file tree

Hide file tree

Showing 5 changed files with 176 additions and 29 deletions.
diff --git a/pkg/section/parser.go b/pkg/section/parser.go
@@ -22,7 +22,7 @@ func Parse(data []string) (SectionList, error) {
 		if s == "default" {
 			list = append(list, Default{})
 		} else if s == "standard" {
-			list = append(list, NewStandard())
+			list = append(list, Standard{})
 		} else if s == "newline" {
 			list = append(list, NewLine{})
 		} else if strings.HasPrefix(s, "prefix(") && len(d) > 8 {

diff --git a/pkg/section/section.go b/pkg/section/section.go
@@ -28,7 +28,7 @@ func (list SectionList) String() []string {
 }
 
 func DefaultSections() SectionList {
-	return SectionList{NewStandard(), Default{}}
+	return SectionList{Standard{}, Default{}}
 }
 
 func DefaultSectionSeparators() SectionList {

diff --git a/pkg/section/standard.go b/pkg/section/standard.go
@@ -1,33 +1,16 @@
 package section
 
 import (
-	"golang.org/x/tools/go/packages"
-
 	"github.com/daixiang0/gci/pkg/parse"
 	"github.com/daixiang0/gci/pkg/specificity"
 )
 
 const StandardType = "standard"
 
-type Standard struct {
-	standardPackages map[string]struct{}
-}
-
-func NewStandard() Standard {
-	pkgs, err := packages.Load(nil, "std")
-	if err != nil {
-		panic(err)
-	}
-
-	standardPackages := make(map[string]struct{})
-	for _, p := range pkgs {
-		standardPackages[p.PkgPath] = struct{}{}
-	}
-	return Standard{standardPackages: standardPackages}
-}
+type Standard struct{}
 
 func (s Standard) MatchSpecificity(spec *parse.GciImports) specificity.MatchSpecificity {
-	if _, ok := s.standardPackages[spec.Path]; ok {
+	if isStandard(spec.Path) {
 		return specificity.StandardMatch{}
 	}
 	return specificity.MisMatch{}
@@ -40,3 +23,8 @@ func (s Standard) String() string {
 func (s Standard) Type() string {
 	return StandardType
 }
+
+func isStandard(pkg string) bool {
+	_, ok := standardPackages[pkg]
+	return ok
+}
diff --git a/pkg/section/standard_list.go b/pkg/section/standard_list.go
diff --git a/pkg/section/standard_test.go b/pkg/section/standard_test.go
@@ -7,15 +7,14 @@ import (
 )
 
 func TestStandardPackageSpecificity(t *testing.T) {
-	standard := NewStandard()
 	testCases := []specificityTestData{
-		{"context", standard, specificity.StandardMatch{}},
-		{"contexts", standard, specificity.MisMatch{}},
-		{"crypto", standard, specificity.StandardMatch{}},
-		{"crypto1", standard, specificity.MisMatch{}},
-		{"crypto/ae", standard, specificity.MisMatch{}},
-		{"crypto/aes", standard, specificity.StandardMatch{}},
-		{"crypto/aes2", standard, specificity.MisMatch{}},
+		{"context", Standard{}, specificity.StandardMatch{}},
+		{"contexts", Standard{}, specificity.MisMatch{}},
+		{"crypto", Standard{}, specificity.StandardMatch{}},
+		{"crypto1", Standard{}, specificity.MisMatch{}},
+		{"crypto/ae", Standard{}, specificity.MisMatch{}},
+		{"crypto/aes", Standard{}, specificity.StandardMatch{}},
+		{"crypto/aes2", Standard{}, specificity.MisMatch{}},
 	}
 	testSpecificity(t, testCases)
 }