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

Improve language in terminal

Browse source
This commit is contained in:
Daniel Imms 2020-06-19 05:22:36 -07:00
parent 10a7e8cc48
commit c69da43f9f
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/vs/workbench/contrib/terminal/browser/terminalConfigHelper.ts
View file

@ -214,7 +214,7 @@ export class TerminalConfigHelper implements IBrowserTerminalConfigHelper {
const shellArgsConfigValue = this._configurationService.inspect<string[]>(`terminal.integrated.shellArgs.${platformKey}`);
const envConfigValue = this._configurationService.inspect<{ [key: string]: string }>(`terminal.integrated.env.${platformKey}`);
// Check if workspace setting exists and whether it's whitelisted
// Check if workspace setting exists and whether it's allowed
let isWorkspaceShellAllowed: boolean | undefined = false;
if (shellConfigValue.workspaceValue !== undefined || shellArgsConfigValue.workspaceValue !== undefined || envConfigValue.workspaceValue !== undefined) {
isWorkspaceShellAllowed = this.isWorkspaceShellAllowed(undefined);
@ -226,7 +226,7 @@ export class TerminalConfigHelper implements IBrowserTerminalConfigHelper {
isWorkspaceShellAllowed = true;
}
// Check if the value is neither blacklisted (false) or whitelisted (true) and ask for
// Check if the value is neither on the blocklist (false) or allowlist (true) and ask for
// permission
if (isWorkspaceShellAllowed === undefined) {
let shellString: string | undefined;

4
src/vs/workbench/contrib/terminal/node/terminalEnvironment.ts
View file

@ -48,7 +48,7 @@ export async function getMainProcessParentEnv(): Promise<IProcessEnvironment> {
// For macOS we want the "root" environment as shells by default run as login shells. It
// doesn't appear to be possible to get the "root" environment as `ps eww -o command` for
// PID 1 (the parent of the main process when launched from the dock/finder) returns no
// environment, because of this we will fill in the root environment using a whitelist of
// environment, because of this we will fill in the root environment using a allowlist of
// environment variables that we have.
if (isMacintosh) {
mainProcessParentEnv = {};
@ -129,4 +129,4 @@ export async function findExecutable(command: string, cwd?: string, paths?: stri
}
const fullPath = path.join(cwd, command);
return await exists(fullPath) ? fullPath : undefined;
}
}