Fix goPath trimming in NewPackage func

cli.go

@@ -54,16 +54,24 @@ func currentPackage(goPath string) (string, error) {
 		return "", err
 	}
 
-	for _, goPathDir := range strings.Split(goPath, ":") {
+	if packagePath, found := trimGopath(goPath, currDir); found {
+		return packagePath, nil
+	}
+
+	return "", fmt.Errorf("Current dir %v is outside of GOPATH(%v). "+
+		"Can't get current package name", currDir, goPath)
+}
+
+func trimGopath(goPath string, packagePath string) (trimmedPath string, trimmed bool) {
+	for _, goPathDir := range filepath.SplitList(goPath) {
 		goPathSrc, err := filepath.Abs(filepath.Join(goPathDir, "/src"))
 		if err != nil {
 			continue
 		}
-		if strings.HasPrefix(currDir, goPathSrc) {
-			return strings.TrimPrefix(currDir, goPathSrc+"/"), nil
+		if strings.HasPrefix(packagePath, goPathSrc) {
+			return strings.TrimPrefix(packagePath, goPathSrc+"/"), true
 		}
 	}
 
-	return "", fmt.Errorf("Current dir %v is outside of GOPATH(%v). "+
-		"Can't get current package name", currDir, goPath)
+	return packagePath, false
 }

save.go

@@ -104,7 +104,7 @@ func NewPackage(importPath string, goPath string) (*GoPackage, error) {
 			fullPath, err)
 	}
 
-	pkgRoot := strings.TrimPrefix(repoRoot, goPath+"/src/")
+	pkgRoot, _ := trimGopath(goPath, repoRoot)
 
 	if strings.Contains(pkgRoot, "/vendor/") {
 		return nil, nil
@@ -136,7 +136,7 @@ func NewPackage(importPath string, goPath string) (*GoPackage, error) {
 }
 
 func goPackageDir(importPath, goPath string) (string, error) {
-	for _, goPathDir := range strings.Split(goPath, ":") {
+	for _, goPathDir := range filepath.SplitList(goPath) {
 		expectedPath := filepath.Clean(goPathDir + "/src/" + importPath)
 		if _, err := os.Stat(expectedPath); err == nil {
 			return expectedPath, nil