Merge pull request #53 from karalabe/relative-imports

imikushin · web-flow · commit 98d96125a451 · 2016-10-24T11:32:19.000-07:00
Resolve relative import paths.
diff --git a/trash.go b/trash.go
@@ -475,6 +475,8 @@ func listImports(rootPackage, libRoot, pkg string) <-chan util.Packages {
 					imp := v.Path.Value[1 : len(v.Path.Value)-1]
 					if pkgComponents := strings.Split(imp, "/"); !strings.Contains(pkgComponents[0], ".") {
 						continue
+					} else if pkgComponents[0] == "." || pkgComponents[0] == ".." {
+						imp = filepath.Clean(filepath.Join(pkg, imp))
 					}
 					if imp == rootPackage || strings.HasPrefix(imp, rootPackage+"/") {
 						continue

Original file line number	Diff line number	Diff line change
`@@ -475,6 +475,8 @@ func listImports(rootPackage, libRoot, pkg string) <-chan util.Packages {`
`475`	`475`	`imp := v.Path.Value[1 : len(v.Path.Value)-1]`
`476`	`476`	`if pkgComponents := strings.Split(imp, "/"); !strings.Contains(pkgComponents[0], ".") {`
`477`	`477`	`continue`
	`478`	`+ } else if pkgComponents[0] == "." \|\| pkgComponents[0] == ".." {`
	`479`	`+ imp = filepath.Clean(filepath.Join(pkg, imp))`
`478`	`480`	`}`
`479`	`481`	`if imp == rootPackage \|\| strings.HasPrefix(imp, rootPackage+"/") {`
`480`	`482`	`continue`