From 108d4dfbf4ebdbd1d0b7a7ccc4dc35bca47af1cf Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Mon, 13 Jul 2020 06:37:04 -0700 Subject: [PATCH] Return '' from env.shell, remove env var collection overrides Part of #101857 --- .../workbench/api/common/extHostTerminalService.ts | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/vs/workbench/api/common/extHostTerminalService.ts b/src/vs/workbench/api/common/extHostTerminalService.ts index 462516d4489..0c7fd876a8d 100644 --- a/src/vs/workbench/api/common/extHostTerminalService.ts +++ b/src/vs/workbench/api/common/extHostTerminalService.ts @@ -827,7 +827,8 @@ export class WorkerExtHostTerminalService extends BaseExtHostTerminalService { } public getDefaultShell(useAutomationShell: boolean, configProvider: ExtHostConfigProvider): string { - throw new NotImplementedError(); + // Return the empty string to avoid throwing + return ''; } public getDefaultShellArgs(useAutomationShell: boolean, configProvider: ExtHostConfigProvider): string[] | string { @@ -849,13 +850,4 @@ export class WorkerExtHostTerminalService extends BaseExtHostTerminalService { public $acceptWorkspacePermissionsChanged(isAllowed: boolean): void { // No-op for web worker ext host as workspace permissions aren't used } - - public getEnvironmentVariableCollection(extension: IExtensionDescription, persistent?: boolean): vscode.EnvironmentVariableCollection { - // This is not implemented so worker ext host extensions cannot influence terminal envs - throw new NotImplementedError(); - } - - public $initEnvironmentVariableCollections(collections: [string, ISerializableEnvironmentVariableCollection][]): void { - // No-op for web worker ext host as collections aren't used - } }