From 7ee9a7af9f3577b710767c20e1135e710bdbe508 Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Tue, 12 Jun 2018 10:48:06 +0200 Subject: [PATCH] Always allow workspace shellArgs [] Fixes #51645 --- .../parts/terminal/electron-browser/terminalConfigHelper.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.ts index efbdc7e94fe..a49e73b87ca 100644 --- a/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.ts +++ b/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.ts @@ -169,6 +169,11 @@ export class TerminalConfigHelper implements ITerminalConfigHelper { isWorkspaceShellAllowed = this._storageService.getBoolean(IS_WORKSPACE_SHELL_ALLOWED_STORAGE_KEY, StorageScope.WORKSPACE, undefined); } + // Always allow [] args as it would lead to an odd error message and should not be dangerous + if (shellConfigValue.workspace === undefined && shellArgsConfigValue.workspace.length === 0) { + isWorkspaceShellAllowed = true; + } + // Check if the value is neither blacklisted (false) or whitelisted (true) and ask for // permission if (isWorkspaceShellAllowed === undefined) { -- GitLab