From 7bbafc2221841d7d22cfb18d0b0c8650054aded4 Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Wed, 8 Jan 2020 11:40:35 +0100 Subject: [PATCH] Fix #87088 --- src/vs/workbench/api/node/extHostTerminalService.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/vs/workbench/api/node/extHostTerminalService.ts b/src/vs/workbench/api/node/extHostTerminalService.ts index 3520c972960..f318235a519 100644 --- a/src/vs/workbench/api/node/extHostTerminalService.ts +++ b/src/vs/workbench/api/node/extHostTerminalService.ts @@ -59,7 +59,7 @@ export class ExtHostTerminalService extends BaseExtHostTerminalService { } public getDefaultShell(useAutomationShell: boolean, configProvider: ExtHostConfigProvider): string { - const fetchSetting = (key: string) => { + const fetchSetting = (key: string): { userValue: string | string[] | undefined, value: string | string[] | undefined, defaultValue: string | string[] | undefined } => { const setting = configProvider .getConfiguration(key.substr(0, key.lastIndexOf('.'))) .inspect(key.substr(key.lastIndexOf('.') + 1)); @@ -79,7 +79,7 @@ export class ExtHostTerminalService extends BaseExtHostTerminalService { } private _getDefaultShellArgs(useAutomationShell: boolean, configProvider: ExtHostConfigProvider): string[] | string { - const fetchSetting = (key: string) => { + const fetchSetting = (key: string): { userValue: string | string[] | undefined, value: string | string[] | undefined, defaultValue: string | string[] | undefined } => { const setting = configProvider .getConfiguration(key.substr(0, key.lastIndexOf('.'))) .inspect(key.substr(key.lastIndexOf('.') + 1)); @@ -91,11 +91,11 @@ export class ExtHostTerminalService extends BaseExtHostTerminalService { private _apiInspectConfigToPlain( config: { key: string; defaultValue?: T; globalValue?: T; workspaceValue?: T, workspaceFolderValue?: T } | undefined - ): { user: T | undefined, value: T | undefined, default: T | undefined } { + ): { userValue: T | undefined, value: T | undefined, defaultValue: T | undefined } { return { - user: config ? config.globalValue : undefined, + userValue: config ? config.globalValue : undefined, value: config ? config.workspaceValue : undefined, - default: config ? config.defaultValue : undefined, + defaultValue: config ? config.defaultValue : undefined, }; } -- GitLab