Refactor for corner cases

microsoft · Nov 30, 2016 · 0505f2a · 0505f2a
1 parent 5673d88
commit 0505f2a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/goImport.ts b/src/goImport.ts
@@ -74,9 +74,14 @@ export function listPackages(excludeImportedPkgs: boolean = false): Thenable<str
 					return;
 				}
 
-				let magicVendorString = 'vendor/';
+				let magicVendorString = '/vendor/';
 				let vendorIndex = pkg.indexOf(magicVendorString);
-
+				if (vendorIndex === -1) {
+					magicVendorString = 'vendor/';
+					if (pkg.startsWith(magicVendorString)) {
+						vendorIndex = 0;
+					}
+				}
 				// Check if current file and the vendor pkg belong to the same root project
 				// If yes, then vendor pkg can be replaced with its relative path to the "vendor" folder
 				// If not, then the vendor pkg should not be allowed to be imported.

diff --git a/src/goSuggest.ts b/src/goSuggest.ts
@@ -218,7 +218,7 @@ export class GoCompletionItemProvider implements vscode.CompletionItemProvider {
 					let pkgName = index === -1 ? pkg : pkg.substr(index + 1);
 					// pkgs from gopkg.in will be of the form gopkg.in/user/somepkg.v3
 					if (pkg.match(/gopkg\.in\/.*\.v\d+/)) {
-						pkgName = pkgName.substr(0, pkgName.indexOf('.v'));
+						pkgName = pkgName.substr(0, pkgName.lastIndexOf('.v'));
 					}
 					return {
 						name: pkgName,