Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-25 11:08:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

add MessageItem#isCloseAffordance, fixes #5448

Browse Source
This commit is contained in:
Johannes Rieken
2016-04-25 11:18:57 +02:00
parent ab509eeb17
commit 9e4d70636d
3 changed files with 94 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/vs/workbench/api/node/extHostMessageService.ts
View File

@@ -22,14 +22,15 @@ export class ExtHostMessageService {
showMessage(severity: Severity, message: string, commands: (string|vscode.MessageItem)[]): Thenable<string|vscode.MessageItem> {
const items: { title: string; handle: number; }[] = [];
const items: { title: string; isCloseAffordance: boolean; handle: number; }[] = [];
for (let handle = 0; handle < commands.length; handle++) {
let command = commands[handle];
if (typeof command === 'string') {
items.push({ title: command, handle });
items.push({ title: command, handle, isCloseAffordance: false });
} else {
items.push({ title: command.title, handle });
let {title, isCloseAffordance} = command;
items.push({ title, isCloseAffordance, handle });
}
}
@@ -50,23 +51,29 @@ export class MainThreadMessageService {
this._messageService = messageService;
}
$showMessage(severity: Severity, message: string, commands: { title: string; handle: number;}[]): Thenable<number> {
$showMessage(severity: Severity, message: string, commands: { title: string; isCloseAffordance: boolean; handle: number;}[]): Thenable<number> {
let hide: (handle?: number) => void;
let actions: Action[] = [];
actions.push(new Action('__close', nls.localize('close', "Close"), undefined, true, () => {
hide();
return Promise.as(undefined);
}));
let hasCloseAffordance = false;
commands.forEach(command => {
if (command.isCloseAffordance === true) {
hasCloseAffordance = true;
}
actions.push(new Action('_extension_message_handle_' + command.handle, command.title, undefined, true, () => {
hide(command.handle);
return Promise.as(undefined);
}));
});
if (!hasCloseAffordance) {
actions.unshift(new Action('__close', nls.localize('close', "Close"), undefined, true, () => {
hide();
return Promise.as(undefined);
}));
}
return new Promise<number>((c) => {
let messageHide: Function;