Pass current GOPATH to Delve. Fix for 1057 (#1065)

* pass current GOPATH to Delve * pass current GOPATH to Delve
microsoft · Jul 8, 2017 · cf6a40d · cf6a40d
1 parent 8344b4c
commit cf6a40d
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/goRunTestCodelens.ts b/src/goRunTestCodelens.ts
@@ -16,7 +16,10 @@ export class GoRunTestCodeLensProvider implements CodeLensProvider {
 				'name': 'Launch',
 				'type': 'go',
 				'request': 'launch',
-				'mode': 'test'
+				'mode': 'test',
+				'env': {
+					'GOPATH': process.env['GOPATH'] // Passing current GOPATH to Delve as it runs in another process
+				}
 			};
 
 	public provideCodeLenses(document: TextDocument, token: CancellationToken): CodeLens[] | Thenable<CodeLens[]> {
@@ -69,7 +72,7 @@ export class GoRunTestCodeLensProvider implements CodeLensProvider {
 
 				const args = ['-test.run', func.name];
 				const program = path.dirname(document.fileName);
-				const env = vsConfig['testEnvVars'] || {};
+				const env = Object.assign({ }, this.debugConfig.env, vsConfig['testEnvVars']);
 				const envFile = vsConfig['testEnvFile'];
 
 				let config = Object.assign({}, this.debugConfig, { args, program, env, envFile });