development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-09-13 13:46:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

more setting name adjustments #143290

Browse source
This commit is contained in:
meganrogge 2022-02-17 12:46:12 -06:00
parent 031c9cc345
commit 371ed7a962
No known key found for this signature in database
GPG key ID: 1367081C49377970
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/vs/workbench/contrib/terminal/browser/links/terminalShellIntegrationLinkDetector.ts
View file

@ -62,6 +62,6 @@ export class TerminalShellIntegrationLinkDetector implements ITerminalLinkDetect
}
private async _hideMessage() {
await this._configurationService.updateValue(TerminalSettingId.ShowShellIntegrationWelcome, false);
await this._configurationService.updateValue(TerminalSettingId.ShellIntegrationShowWelcome, false);
}
}

8
src/vs/workbench/contrib/terminal/common/terminalEnvironment.ts
View file

@ -452,7 +452,7 @@ export function injectShellIntegrationArgs(
}
}
if (newArgs) {
const showWelcome = configurationService.getValue(TerminalSettingId.ShowShellIntegrationWelcome);
const showWelcome = configurationService.getValue(TerminalSettingId.ShellIntegrationShowWelcome);
const additionalArgs = showWelcome ? '' : ' -HideWelcome';
newArgs = [...newArgs]; // Shallow clone the array to avoid setting the default array
newArgs[newArgs.length - 1] = format(newArgs[newArgs.length - 1], additionalArgs);
@ -466,7 +466,7 @@ export function injectShellIntegrationArgs(
env['VSCODE_SHELL_LOGIN'] = '1';
newArgs = shellIntegrationArgs.get(ShellIntegrationExecutable.Bash);
}
const showWelcome = configurationService.getValue(TerminalSettingId.ShowShellIntegrationWelcome);
const showWelcome = configurationService.getValue(TerminalSettingId.ShellIntegrationShowWelcome);
if (!showWelcome) {
env['VSCODE_SHELL_HIDE_WELCOME'] = '1';
}
@ -479,7 +479,7 @@ export function injectShellIntegrationArgs(
newArgs = shellIntegrationArgs.get(ShellIntegrationExecutable.PwshLogin);
}
if (newArgs) {
const showWelcome = configurationService.getValue(TerminalSettingId.ShowShellIntegrationWelcome);
const showWelcome = configurationService.getValue(TerminalSettingId.ShellIntegrationShowWelcome);
const additionalArgs = showWelcome ? '' : ' -HideWelcome';
newArgs = [...newArgs]; // Shallow clone the array to avoid setting the default array
newArgs[newArgs.length - 1] = format(newArgs[newArgs.length - 1], additionalArgs);
@ -492,7 +492,7 @@ export function injectShellIntegrationArgs(
} else if (areZshBashLoginArgs(originalArgs)) {
newArgs = shellIntegrationArgs.get(ShellIntegrationExecutable.ZshLogin);
}
const showWelcome = configurationService.getValue(TerminalSettingId.ShowShellIntegrationWelcome);
const showWelcome = configurationService.getValue(TerminalSettingId.ShellIntegrationShowWelcome);
if (!showWelcome) {
env['VSCODE_SHELL_HIDE_WELCOME'] = '1';
}