maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Resolve profile environment when launching default

Browse source 
Fixes #122358
This commit is contained in:
Daniel Imms 2021-04-28 08:07:54 -07:00
parent 13d3c0e757
commit 24faa3733f
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/vs/workbench/contrib/terminal/browser/terminalProfileResolverService.ts
View file

@ -64,6 +64,13 @@ export abstract class BaseTerminalProfileResolverService implements ITerminalPro
}
shellLaunchConfig.executable = resolvedProfile.path;
shellLaunchConfig.args = resolvedProfile.args;
if (resolvedProfile.env) {
if (shellLaunchConfig.env) {
shellLaunchConfig.env = { ...shellLaunchConfig.env, ...resolvedProfile.env };
} else {
shellLaunchConfig.env = resolvedProfile.env;
}
}
// Verify the icon is valid, and fallback correctly to the generic terminal id if there is
// an issue