Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-23 01:58:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move off deprecated resolve function

Browse Source 
Fixes #120328
This commit is contained in:
Daniel Imms
2021-04-22 03:10:21 -07:00
parent 29ade591f5
commit eaf3a5dcda
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/vs/workbench/api/node/extHostTerminalService.ts
View File

@@ -86,7 +86,7 @@ export class ExtHostTerminalService extends BaseExtHostTerminalService {
this._defaultShell ?? getSystemShellSync(platform.OS, process.env as platform.IProcessEnvironment),
process.env.hasOwnProperty('PROCESSOR_ARCHITEW6432'),
process.env.windir,
terminalEnvironment.createVariableResolver(this._lastActiveWorkspace, this._variableResolver),
terminalEnvironment.createVariableResolver(this._lastActiveWorkspace, process.env, this._variableResolver),
this._logService,
useAutomationShell
);
@@ -99,7 +99,7 @@ export class ExtHostTerminalService extends BaseExtHostTerminalService {
.get<string | string[]>(key.substr(key.lastIndexOf('.') + 1));
};
return terminalEnvironment.getDefaultShellArgs(fetchSetting, useAutomationShell, terminalEnvironment.createVariableResolver(this._lastActiveWorkspace, this._variableResolver), this._logService);
return terminalEnvironment.getDefaultShellArgs(fetchSetting, useAutomationShell, terminalEnvironment.createVariableResolver(this._lastActiveWorkspace, process.env, this._variableResolver), this._logService);
}
private _registerListeners(): void {