List import paths for packages vendored only for the current package

Author: nrvnrvn

autocompletecontext.go

@@ -257,18 +257,19 @@ func (c *auto_complete_context) get_candidates_from_decl(cc cursor_context, clas
 }
 
 func (c *auto_complete_context) get_import_candidates(partial string, b *out_buffers) {
-	pkgdirs := g_daemon.context.pkg_dirs()
+	currentPackagePath, pkgdirs := g_daemon.context.pkg_dirs()
+	fmt.Println(pkgdirs)
 	resultSet := map[string]struct{}{}
 	for _, pkgdir := range pkgdirs {
 		// convert srcpath to pkgpath and get candidates
-		get_import_candidates_dir(pkgdir, filepath.FromSlash(partial), b.ignorecase, resultSet)
+		get_import_candidates_dir(pkgdir, filepath.FromSlash(partial), b.ignorecase, currentPackagePath, resultSet)
 	}
 	for k := range resultSet {
 		b.candidates = append(b.candidates, candidate{Name: k, Class: decl_import})
 	}
 }
 
-func get_import_candidates_dir(root, partial string, ignorecase bool, r map[string]struct{}) {
+func get_import_candidates_dir(root, partial string, ignorecase bool, currentPackagePath string, r map[string]struct{}) {
 	var fpath string
 	var match bool
 	if strings.HasSuffix(partial, "/") {
@@ -287,15 +288,17 @@ func get_import_candidates_dir(root, partial string, ignorecase bool, r map[stri
 		if match && !has_prefix(rel, partial, ignorecase) {
 			continue
 		} else if fi[i].IsDir() {
-			get_import_candidates_dir(root, rel+string(filepath.Separator), ignorecase, r)
+			get_import_candidates_dir(root, rel+string(filepath.Separator), ignorecase, currentPackagePath, r)
 		} else {
 			ext := filepath.Ext(name)
 			if ext != ".a" {
 				continue
 			} else {
 				rel = rel[0 : len(rel)-2]
 			}
-			r[vendorlessImportPath(filepath.ToSlash(rel))] = struct{}{}
+			if ipath, ok := vendorlessImportPath(filepath.ToSlash(rel), currentPackagePath); ok {
+				r[ipath] = struct{}{}
+			}
 		}
 	}
 }

declcache.go

@@ -453,9 +453,10 @@ func (ctxt *package_lookup_context) gopath() []string {
 	return all
 }
 
-func (ctxt *package_lookup_context) pkg_dirs() []string {
+func (ctxt *package_lookup_context) pkg_dirs() (string, []string) {
 	pkgdir := fmt.Sprintf("%s_%s", ctxt.GOOS, ctxt.GOARCH)
 
+	var currentPackagePath string
 	var all []string
 	if ctxt.GOROOT != "" {
 		dir := filepath.Join(ctxt.GOROOT, "pkg", pkgdir)
@@ -466,6 +467,7 @@ func (ctxt *package_lookup_context) pkg_dirs() []string {
 
 	switch g_config.PackageLookupMode {
 	case "go":
+		currentPackagePath = ctxt.CurrentPackagePath
 		for _, p := range ctxt.gopath() {
 			dir := filepath.Join(p, "pkg", pkgdir)
 			if is_dir(dir) {
@@ -483,7 +485,7 @@ func (ctxt *package_lookup_context) pkg_dirs() []string {
 	case "bzl":
 		// TODO: Support bazel mode
 	}
-	return all
+	return currentPackagePath, all
 }
 
 type decl_cache struct {

utils.go

@@ -153,15 +153,24 @@ func find_gb_project_root(path string) (string, error) {
 
 // vendorlessImportPath returns the devendorized version of the provided import path.
 // e.g. "foo/bar/vendor/a/b" => "a/b"
-func vendorlessImportPath(ipath string) string {
+func vendorlessImportPath(ipath string, currentPackagePath string) (string, bool) {
+	split := strings.Split(ipath, "vendor/")
+	// no vendor in path
+	if len(split) == 1 {
+		return ipath, true
+	}
+	// this import path does not belong to the current package
+	if currentPackagePath != "" && !strings.Contains(currentPackagePath, split[0]) {
+		return "", false
+	}
 	// Devendorize for use in import statement.
 	if i := strings.LastIndex(ipath, "/vendor/"); i >= 0 {
-		return ipath[i+len("/vendor/"):]
+		return ipath[i+len("/vendor/"):], true
 	}
 	if strings.HasPrefix(ipath, "vendor/") {
-		return ipath[len("vendor/"):]
+		return ipath[len("vendor/"):], true
 	}
-	return ipath
+	return ipath, true
 }
 
 //-------------------------------------------------------------------------