Dont infer GOPATH when debugging if one is provided #1196

microsoft · Sep 6, 2017 · e929b16 · e929b16
1 parent 1037473
commit e929b16
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/Go-latest.vsix b/Go-latest.vsix
diff --git a/src/debugAdapter/goDebug.ts b/src/debugAdapter/goDebug.ts
@@ -229,13 +229,15 @@ class Delve {
 
 			let env = Object.assign({}, process.env, fileEnv, launchArgs.env);
 
-			// If file/package to debug is not under env['GOPATH'], then infer it from the file/package path
-			// Not applicable to exec mode in which case `program` need not point to source code under GOPATH
-			let programNotUnderGopath = !env['GOPATH'] || !getCurrentGoWorkspaceFromGOPATH(env['GOPATH'], isProgramDirectory ? program : path.dirname(program));
-			if (programNotUnderGopath && (mode === 'debug' || mode === 'test')) {
-				env['GOPATH'] = getInferredGopath(isProgramDirectory ? program : path.dirname(program)) || env['GOPATH'];
+			if (!fileEnv['GOPATH'] && !launchArgs.env['GOPATH'] && (mode === 'debug' || mode === 'test')) {
+				// If user hasnt specified GOPATH & file/package to debug is not under env['GOPATH'], then infer it from the file/package path
+				// Not applicable to exec mode in which case `program` need not point to source code under GOPATH
+				let programNotUnderGopath = !env['GOPATH'] || !getCurrentGoWorkspaceFromGOPATH(env['GOPATH'], isProgramDirectory ? program : path.dirname(program));
+				if (programNotUnderGopath ) {
+					env['GOPATH'] = getInferredGopath(isProgramDirectory ? program : path.dirname(program)) || env['GOPATH'];
+				}
 			}
-
+			
 			verbose(`Using GOPATH: ${env['GOPATH']}`);
 
 			if (!!launchArgs.noDebug) {