Use getToolsEnvVars instead which resolves variables

microsoft · Aug 13, 2018 · 3efca28 · 3efca28
1 parent 2cc9952
commit 3efca28
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/goDebugConfiguration.ts b/src/goDebugConfiguration.ts
@@ -1,7 +1,7 @@
 'use strict';
 
 import vscode = require('vscode');
-import { getCurrentGoPath } from './util';
+import { getCurrentGoPath, getToolsEnvVars } from './util';
 
 export class GoDebugConfigurationProvider implements vscode.DebugConfigurationProvider {
 
@@ -47,7 +47,7 @@ export class GoDebugConfigurationProvider implements vscode.DebugConfigurationPr
  }
 
  const goConfig = vscode.workspace.getConfiguration('go', folder ? folder.uri : null);
- const goToolsEnvVars = goConfig.get('toolsEnvVars') || {};
+ const goToolsEnvVars = getToolsEnvVars();
  Object.keys(goToolsEnvVars).forEach(key => {
  if (!debugConfiguration['env'].hasOwnProperty(key)) {
  debugConfiguration['env'][key] = goToolsEnvVars[key];