support multi-path gopath

wencan · wencan · commit cb00ee436705 · 2020-05-25T09:33:28.000+08:00
diff --git a/mockgen/parse.go b/mockgen/parse.go
@@ -641,13 +641,16 @@ func parsePackageImport(srcDir string) (string, error) {
 		}
 	}
 	// fall back to GOPATH mode
-	goPath := os.Getenv("GOPATH")
-	if goPath == "" {
+	goPaths := os.Getenv("GOPATH")
+	if goPaths == "" {
 		return "", fmt.Errorf("GOPATH is not set")
 	}
-	sourceRoot := filepath.Join(goPath, "src") + string(os.PathSeparator)
-	if !strings.HasPrefix(srcDir, sourceRoot) {
-		return "", errOutsideGoPath
+	goPathList := strings.Split(goPaths, ":")
+	for _, goPath := range goPathList {
+		sourceRoot := filepath.Join(goPath, "src") + string(os.PathSeparator)
+		if strings.HasPrefix(srcDir, sourceRoot) {
+			return filepath.ToSlash(strings.TrimPrefix(srcDir, sourceRoot)), nil
+		}
 	}
-	return filepath.ToSlash(strings.TrimPrefix(srcDir, sourceRoot)), nil
+	return "", errOutsideGoPath
 }

Original file line number	Diff line number	Diff line change
`@@ -641,13 +641,16 @@ func parsePackageImport(srcDir string) (string, error) {`
`641`	`641`	`}`
`642`	`642`	`}`
`643`	`643`	`// fall back to GOPATH mode`
`644`		`- goPath := os.Getenv("GOPATH")`
`645`		`- if goPath == "" {`
	`644`	`+ goPaths := os.Getenv("GOPATH")`
	`645`	`+ if goPaths == "" {`
`646`	`646`	`return "", fmt.Errorf("GOPATH is not set")`
`647`	`647`	`}`
`648`		`- sourceRoot := filepath.Join(goPath, "src") + string(os.PathSeparator)`
`649`		`- if !strings.HasPrefix(srcDir, sourceRoot) {`
`650`		`- return "", errOutsideGoPath`
	`648`	`+ goPathList := strings.Split(goPaths, ":")`
	`649`	`+ for _, goPath := range goPathList {`
	`650`	`+ sourceRoot := filepath.Join(goPath, "src") + string(os.PathSeparator)`
	`651`	`+ if strings.HasPrefix(srcDir, sourceRoot) {`
	`652`	`+ return filepath.ToSlash(strings.TrimPrefix(srcDir, sourceRoot)), nil`
	`653`	`+ }`
`651`	`654`	`}`
`652`		`- return filepath.ToSlash(strings.TrimPrefix(srcDir, sourceRoot)), nil`
	`655`	`+ return "", errOutsideGoPath`
`653`	`656`	`}`