fix issue 61

Author: angrychow

lang/golang/parser/utils.go

@@ -73,8 +73,8 @@ func NewPackageCache(lruCapacity int) *PackageCache {
 	}
 }
 
-// Get retrieves a value from the cache.
-func (pc *PackageCache) Get(key string) (bool, bool) {
+// get retrieves a value from the cache.
+func (pc *PackageCache) get(key string) (bool, bool) {
 	pc.lock.Lock()
 	defer pc.lock.Unlock()
 	if elem, ok := pc.cache[key]; ok {
@@ -84,8 +84,8 @@ func (pc *PackageCache) Get(key string) (bool, bool) {
 	return false, false
 }
 
-// Set adds a value to the cache.
-func (pc *PackageCache) Set(key string, value bool) {
+// set adds a value to the cache.
+func (pc *PackageCache) set(key string, value bool) {
 	pc.lock.Lock()
 	defer pc.lock.Unlock()
 
@@ -109,19 +109,19 @@ func (pc *PackageCache) Set(key string, value bool) {
 
 // IsStandardPackage 检查一个包是否为标准库，并使用内部缓存。
 func (pc *PackageCache) IsStandardPackage(path string) bool {
-	if isStd, found := pc.Get(path); found {
+	if isStd, found := pc.get(path); found {
 		return isStd
 	}
 
 	pkg, err := build.Import(path, "", build.FindOnly)
 	if err != nil {
 		// Cannot find the package, assume it's not a standard package
-		pc.Set(path, false)
+		pc.set(path, false)
 		return false
 	}
 
 	isStd := pkg.Goroot
-	pc.Set(path, isStd)
+	pc.set(path, isStd)
 	return isStd
 }
 

lang/golang/parser/utils_test.go

@@ -273,15 +273,15 @@ func Test_isSysPkg(t *testing.T) {
 		assert.Equal(t, 2, stdlibCache.lru.Len(), "Cache size should remain at capacity")
 
 		// 4. "fmt" 应该在 Cache 中
-		_, foundFmt := stdlibCache.Get("fmt")
+		_, foundFmt := stdlibCache.get("fmt")
 		assert.True(t, foundFmt, "fmt should still be in the cache")
 
 		// 5. "net" 应该在 Cache 中
-		_, foundNet := stdlibCache.Get("net")
+		_, foundNet := stdlibCache.get("net")
 		assert.True(t, foundNet, "net should be in the cache")
 
 		// 6. "os" 不应该在 Cache 中
-		_, foundOs := stdlibCache.Get("os")
+		_, foundOs := stdlibCache.get("os")
 		assert.False(t, foundOs, "os should have been evicted from the cache")
 	})
 }

lang/golang/writer/write.go

@@ -35,6 +35,7 @@ import (
 )
 
 var _ uniast.Writer = (*Writer)(nil)
+var testPkgPathRegex = regexp.MustCompile(`^(.+?) \[(.+)\]$`)
 
 type Options struct {
 	// RepoDir   string
@@ -81,6 +82,22 @@ func (w *Writer) WriteRepo(repo *uniast.Repository, outDir string) error {
 	return nil
 }
 
+// sanitizePkgPath sanitize the package path, remove the suffix in brackets
+func sanitizePkgPath(pkgPath string) string {
+	matches := testPkgPathRegex.FindStringSubmatch(pkgPath)
+	// matches should be 3 elements:
+	// 1. The full string
+	// 2. The package name
+	// 3. The content inside the brackets
+	if len(matches) == 3 {
+		packageName := matches[1]
+		testName := matches[2]
+		if testName == packageName+".test" {
+			return packageName
+		}
+	}
+	return pkgPath
+}
 func (w *Writer) WriteModule(repo *uniast.Repository, modPath string, outDir string) error {
 	mod := repo.Modules[modPath]
 	if mod == nil {
@@ -94,7 +111,9 @@ func (w *Writer) WriteModule(repo *uniast.Repository, modPath string, outDir str
 
 	outdir := filepath.Join(outDir, mod.Dir)
 	for dir, pkg := range w.visited {
-		rel := strings.TrimPrefix(dir, mod.Name)
+		// sanitize the package path
+		cleanDir := sanitizePkgPath(dir)
+		rel := strings.TrimPrefix(cleanDir, mod.Name)
 		pkgDir := filepath.Join(outdir, rel)
 		if err := os.MkdirAll(pkgDir, 0755); err != nil {
 			return fmt.Errorf("mkdir %s failed: %v", pkgDir, err)