fix for microsoft#934

goenning · Apr 19, 2017 · 8d59f67 · 8d59f67
1 parent 6ea85f0
commit 8d59f67
Showing 1 changed file with 13 additions and 12 deletions.
diff --git a/src/debugAdapter/goDebug.ts b/src/debugAdapter/goDebug.ts
@@ -207,18 +207,6 @@ class Delve {
 				return reject('The program attribute must point to valid directory, .go file or executable.');
 			}
 
-			// Consolidate env vars
-			let finalEnv: Object = null;
-			if (Object.keys(env).length > 0) {
-				finalEnv = {};
-				for (let k in process.env) {
-					finalEnv[k] = process.env[k];
-				}
-				for (let k in env) {
-					finalEnv[k] = env[k];
-				}
-			}
-
 			if (!!launchArgs.noDebug && mode === 'debug' && !isProgramDirectory) {
 				this.debugProcess = spawn(getGoRuntimePath(), ['run', program], {env: finalEnv});
 				this.debugProcess.stderr.on('data', chunk => {
@@ -269,6 +257,19 @@ class Delve {
 				}
 			}
 
+
+			// Consolidate env vars
+			let finalEnv: Object = null;
+			if (Object.keys(env).length > 0) {
+				finalEnv = {};
+				for (let k in process.env) {
+					finalEnv[k] = process.env[k];
+				}
+				for (let k in env) {
+					finalEnv[k] = env[k];
+				}
+			}
+
 			let dlv = getBinPathWithPreferredGopath('dlv', resolvePath(env['GOPATH']));
 
 			if (!existsSync(dlv)) {