Prioritize current project import suggestions

microsoft · Jul 17, 2018 · dae43db · dae43db
1 parent 81e7053
commit dae43db
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/goPackages.ts b/src/goPackages.ts
@@ -188,7 +188,7 @@ export function getImportablePackages(filePath: string, useCache: boolean = fals
 			if (!foundPkgRootDir) {
 				// try to guess package root dir
 				let vendorIndex = pkgPath.indexOf('/vendor/');
-				if (vendorIndex !== -1 ) {
+				if (vendorIndex !== -1) {
 					foundPkgRootDir = path.join(currentWorkspace, pkgPath.substring(0, vendorIndex).replace('/', path.sep));
 					pkgRootDirs.set(fileDirPath, foundPkgRootDir);
 				}

diff --git a/src/goSuggest.ts b/src/goSuggest.ts
@@ -7,7 +7,7 @@
 
 import vscode = require('vscode');
 import cp = require('child_process');
-import { getBinPath, getParametersAndReturnType, parseFilePrelude, isPositionInString, goKeywords, getToolsEnvVars, guessPackageNameFromFile, goBuiltinTypes, byteOffsetAt } from './util';
+import { getCurrentGoPath, getBinPath, getParametersAndReturnType, parseFilePrelude, isPositionInString, goKeywords, getToolsEnvVars, guessPackageNameFromFile, goBuiltinTypes, byteOffsetAt } from './util';
 import { promptForMissingTool, promptForUpdatingTool } from './goInstallTools';
 import { getTextEditForAddImport } from './goImport';
 import { getImportablePackages } from './goPackages';
@@ -354,6 +354,7 @@ export class GoCompletionItemProvider implements vscode.CompletionItemProvider {
 	private getMatchingPackages(word: string, suggestionSet: Set<string>): vscode.CompletionItem[] {
 		if (!word) return [];
 		let completionItems = [];
+		const rootPath = vscode.workspace.rootPath.slice(getCurrentGoPath().length + 5);
 
 		this.pkgsList.forEach((pkgName: string, pkgPath: string) => {
 			if (pkgName.startsWith(word) && !suggestionSet.has(pkgName)) {
@@ -371,9 +372,15 @@ export class GoCompletionItemProvider implements vscode.CompletionItemProvider {
 				// Add same sortText to the unimported packages so that they appear after the suggestions from gocode
 				const isStandardPackage = !item.detail.includes('.');
 				item.sortText = isStandardPackage ? 'za' : 'zb';
-				completionItems.push(item);
+				if (pkgPath.startsWith(rootPath)) {
+					item.sortText = 'a';
+					completionItems.unshift(item);
+				} else {
+					completionItems.push(item);
+				}
 			}
 		});
+
 		return completionItems;
 	}