diff --git a/src/vs/workbench/api/browser/mainThreadTerminalService.ts b/src/vs/workbench/api/browser/mainThreadTerminalService.ts index 9d7b6dff46a..68913bca466 100644 --- a/src/vs/workbench/api/browser/mainThreadTerminalService.ts +++ b/src/vs/workbench/api/browser/mainThreadTerminalService.ts @@ -309,9 +309,9 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape return true; } - private _onRequestAvailableShells(request: IAvailableShellsRequest): void { + private async _onRequestAvailableShells(callback: IAvailableShellsRequest): Promise { if (this._isPrimaryExtHost()) { - this._proxy.$requestAvailableShells().then(e => request(e)); + callback(await this._proxy.$getAvailableShells()); } } diff --git a/src/vs/workbench/api/common/extHost.protocol.ts b/src/vs/workbench/api/common/extHost.protocol.ts index 40bb47aef3b..74abb50cd7d 100644 --- a/src/vs/workbench/api/common/extHost.protocol.ts +++ b/src/vs/workbench/api/common/extHost.protocol.ts @@ -1287,7 +1287,7 @@ export interface ExtHostTerminalServiceShape { $acceptProcessRequestCwd(id: number): void; $acceptProcessRequestLatency(id: number): number; $acceptWorkspacePermissionsChanged(isAllowed: boolean): void; - $requestAvailableShells(): Promise; + $getAvailableShells(): Promise; $requestDefaultShellAndArgs(useAutomationShell: boolean): Promise; } diff --git a/src/vs/workbench/api/common/extHostTerminalService.ts b/src/vs/workbench/api/common/extHostTerminalService.ts index 14a2c9cc9e6..1287e9dc8d7 100644 --- a/src/vs/workbench/api/common/extHostTerminalService.ts +++ b/src/vs/workbench/api/common/extHostTerminalService.ts @@ -325,7 +325,7 @@ export abstract class BaseExtHostTerminalService implements IExtHostTerminalServ public abstract getDefaultShell(useAutomationShell: boolean, configProvider: ExtHostConfigProvider): string; public abstract getDefaultShellArgs(useAutomationShell: boolean, configProvider: ExtHostConfigProvider): string[] | string; public abstract $spawnExtHostProcess(id: number, shellLaunchConfigDto: IShellLaunchConfigDto, activeWorkspaceRootUriComponents: UriComponents, cols: number, rows: number, isWorkspaceShellAllowed: boolean): Promise; - public abstract $requestAvailableShells(): Promise; + public abstract $getAvailableShells(): Promise; public abstract $requestDefaultShellAndArgs(useAutomationShell: boolean): Promise; public abstract $acceptWorkspacePermissionsChanged(isAllowed: boolean): void; @@ -606,7 +606,7 @@ export class WorkerExtHostTerminalService extends BaseExtHostTerminalService { throw new Error('Not implemented'); } - public $requestAvailableShells(): Promise { + public $getAvailableShells(): Promise { throw new Error('Not implemented'); } diff --git a/src/vs/workbench/api/node/extHostTerminalService.ts b/src/vs/workbench/api/node/extHostTerminalService.ts index 1eda3462786..25caa61049e 100644 --- a/src/vs/workbench/api/node/extHostTerminalService.ts +++ b/src/vs/workbench/api/node/extHostTerminalService.ts @@ -200,7 +200,7 @@ export class ExtHostTerminalService extends BaseExtHostTerminalService { this._setupExtHostProcessListeners(id, new TerminalProcess(shellLaunchConfig, initialCwd, cols, rows, env, enableConpty, this._logService)); } - public $requestAvailableShells(): Promise { + public $getAvailableShells(): Promise { return detectAvailableShells(); }