Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-24 02:28:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor parseMessageArguments

Browse Source
This commit is contained in:
Joao Moreno
2017-02-02 18:21:21 +01:00
parent c2ad779c60
commit ee0316de2a
2 changed files with 29 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/vs/workbench/api/node/extHost.api.impl.ts
View File

@@ -255,18 +255,6 @@ export function createApiFactory(initData: IInitData, threadService: IThreadServ
}
};
const emptyMessageOptions: vscode.MessageOptions = Object.create(null);
function parseMessageArguments(args: any[]): { options: vscode.MessageOptions; items: any[]; } {
const [first, ...rest] = args;
if (typeof first === 'string' || (first && first.title)) {
return { options: emptyMessageOptions, items: args };
} else {
return { options: first || emptyMessageOptions, items: rest };
}
}
// namespace: window
const window: typeof vscode.window = {
get activeTextEditor() {
@@ -299,17 +287,14 @@ export function createApiFactory(initData: IInitData, threadService: IThreadServ
onDidCloseTerminal(listener, thisArg?, disposables?) {
return extHostTerminalService.onDidCloseTerminal(listener, thisArg, disposables);
},
showInformationMessage(message, ...args) {
const { options, items } = parseMessageArguments(args);
return extHostMessageService.showMessage(Severity.Info, message, options, items);
showInformationMessage(message, first, ...rest) {
return extHostMessageService.showMessage(Severity.Info, message, first, rest);
},
showWarningMessage(message, ...args) {
const { options, items } = parseMessageArguments(args);
return extHostMessageService.showMessage(Severity.Warning, message, options, items);
showWarningMessage(message, first, ...rest) {
return extHostMessageService.showMessage(Severity.Warning, message, first, rest);
},
showErrorMessage(message, ...args) {
const { options, items } = parseMessageArguments(args);
return extHostMessageService.showMessage(Severity.Error, message, options, items);
showErrorMessage(message, first, ...rest) {
return extHostMessageService.showMessage(Severity.Error, message, first, rest);
},
showQuickPick(items: any, options: vscode.QuickPickOptions, token?: vscode.CancellationToken) {
return extHostQuickOpen.showQuickPick(items, options, token);