Workaround for electron issue in #1845

microsoft · Aug 15, 2018 · 4e6b295 · 4e6b295
1 parent 0b68d09
commit 4e6b295
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/Go-latest.vsix b/Go-latest.vsix
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Go",
-  "version": "0.6.87-beta.1",
+  "version": "0.6.87",
   "publisher": "ms-vscode",
   "description": "Rich Go language support for Visual Studio Code",
   "author": {

diff --git a/src/goPackages.ts b/src/goPackages.ts
@@ -22,14 +22,20 @@ let allPkgsCache: Map<string, Cache> = new Map<string, Cache>();
 let pkgRootDirs = new Map<string, string>();
 
 function gopkgs(workDir?: string): Promise<Map<string, string>> {
+	const gopkgsBinPath = getBinPath('gopkgs');
+	if (!path.isAbsolute(gopkgsBinPath)) {
+		promptForMissingTool('gopkgs');
+		return Promise.resolve(new Map<string, string>());
+	}
+
 	let t0 = Date.now();
 	return new Promise<Map<string, string>>((resolve, reject) => {
 		const args = ['-format', '{{.Name}};{{.ImportPath}}'];
 		if (workDir) {
 			args.push('-workDir', workDir);
 		}
 
-		const cmd = cp.spawn(getBinPath('gopkgs'), args, { env: getToolsEnvVars() });
+		const cmd = cp.spawn(gopkgsBinPath, args, { env: getToolsEnvVars() });
 		const chunks = [];
 		const errchunks = [];
 		let err: any;