Use GOPATH from env if dlv not found

microsoft · Jan 16, 2017 · d8802a6 · d8802a6
1 parent ddb434c
commit d8802a6
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/debugAdapter/goDebug.ts b/src/debugAdapter/goDebug.ts
@@ -169,6 +169,14 @@ class Delve {
 				return;
 			}
 			let dlv = getBinPath('dlv');
+
+			// If dlv not found, try using the GOPATH that was set in env in launch.json
+			if (!existsSync(dlv) && env['GOPATH'] && !process.env['GOPATH']) {
+				process.env['GOPATH'] = env['GOPATH'];
+				dlv = getBinPath('dlv');
+				process.env['GOPATH'] = undefined;
+			}
+
 			log('Using dlv at: ', dlv);
 			if (!existsSync(dlv)) {
 				return reject(`Cannot find Delve debugger at ${dlv}. Ensure it is in your "GOPATH/bin" or "PATH".`);