Refactor for corner cases

ramya-rao-a · ramya-rao-a · commit 0505f2afeda1 · 2016-11-29T16:48:51.000-08:00
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,

Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,7 @@ export class GoCompletionItemProvider implements vscode.CompletionItemProvider {`
`218`	`218`	`let pkgName = index === -1 ? pkg : pkg.substr(index + 1);`
`219`	`219`	`// pkgs from gopkg.in will be of the form gopkg.in/user/somepkg.v3`
`220`	`220`	`if (pkg.match(/gopkg\.in\/.*\.v\d+/)) {`
`221`		`- pkgName = pkgName.substr(0, pkgName.indexOf('.v'));`
	`221`	`+ pkgName = pkgName.substr(0, pkgName.lastIndexOf('.v'));`
`222`	`222`	`}`
`223`	`223`	`return {`
`224`	`224`	`name: pkgName,`