Search for dlv in go.toolsGopath too (#2108)

* Search for dlv in go.toolsGopath too Fixes #2099 * Fix review comments
microsoft · Nov 13, 2018 · f460c6e · f460c6e
1 parent 03dc46a
commit f460c6e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/src/debugAdapter/goDebug.ts b/src/debugAdapter/goDebug.ts
@@ -206,6 +206,7 @@ interface LaunchRequestArguments extends DebugProtocol.LaunchRequestArguments {
 	output?: string;
 	/** Delve LoadConfig parameters **/
 	dlvLoadConfig?: LoadConfig;
+	dlvToolPath: string;
 	/** Delve Version */
 	apiVersion: number;
 }
@@ -356,11 +357,9 @@ class Delve {
 				return;
 			}
 
-			let dlv = getBinPathWithPreferredGopath('dlv', [resolveHomeDir(env['GOPATH']), process.env['GOPATH']]);
-
-			if (!existsSync(dlv)) {
-				verbose(`Couldn't find dlv at ${process.env['GOPATH']}${env['GOPATH'] ? ', ' + env['GOPATH'] : ''} or ${envPath}`);
-				return reject(`Cannot find Delve debugger. Install from https://github.com/derekparker/delve & ensure it is in your "GOPATH/bin" or "PATH".`);
+			if (!existsSync(launchArgs.dlvToolPath)) {
+				verbose(`Couldn't find dlv at the Go tools path, ${process.env['GOPATH']}${env['GOPATH'] ? ', ' + env['GOPATH'] : ''} or ${envPath}`);
+				return reject(`Cannot find Delve debugger. Install from https://github.com/derekparker/delve & ensure it is in your Go tools path, "GOPATH/bin" or "PATH".`);
 			}
 
 			let currentGOWorkspace = getCurrentGoWorkspaceFromGOPATH(env['GOPATH'], dirname);
@@ -401,9 +400,9 @@ class Delve {
 			}
 
 			verbose(`Current working directory: ${dlvCwd}`);
-			verbose(`Running: ${dlv} ${dlvArgs.join(' ')}`);
+			verbose(`Running: ${launchArgs.dlvToolPath} ${dlvArgs.join(' ')}`);
 
-			this.debugProcess = spawn(dlv, dlvArgs, {
+			this.debugProcess = spawn(launchArgs.dlvToolPath, dlvArgs, {
 				cwd: dlvCwd,
 				env,
 			});

diff --git a/src/goDebugConfiguration.ts b/src/goDebugConfiguration.ts
@@ -1,7 +1,9 @@
 'use strict';
 
 import vscode = require('vscode');
-import { getCurrentGoPath, getToolsEnvVars, sendTelemetryEvent } from './util';
+import path = require('path');
+import { getCurrentGoPath, getToolsEnvVars, sendTelemetryEvent, getBinPath } from './util';
+import { promptForMissingTool } from './goInstallTools';
 
 export class GoDebugConfigurationProvider implements vscode.DebugConfigurationProvider {
 
@@ -78,11 +80,17 @@ export class GoDebugConfigurationProvider implements vscode.DebugConfigurationPr
 			debugConfiguration['dlvLoadConfig'] = dlvConfig['dlvLoadConfig'];
 		}
 
+		debugConfiguration['dlvToolPath'] = getBinPath('dlv');
+		if (!path.isAbsolute(debugConfiguration['dlvToolPath'])) {
+			promptForMissingTool('dlv');
+			return;
+		}
+
 		if (debugConfiguration['mode'] === 'auto') {
 			debugConfiguration['mode'] = (activeEditor && activeEditor.document.fileName.endsWith('_test.go')) ? 'test' : 'debug';
 		}
 
 		return debugConfiguration;
 	}
 
-}
+}