npm - @codingame/monaco-vscode-notifications-service-override - Versions diffs - 2.0.3 → 2.1.0 - Mend

@codingame/monaco-vscode-notifications-service-override 2.0.3 → 2.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-notifications-service-override",
-  "version": "2.0.3",
+  "version": "2.1.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,8 +18,8 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@2.0.3",
+    "vscode": "npm:@codingame/monaco-vscode-api@2.1.0",
     "vscode-marked": "npm:marked@=3.0.2",
-    "@codingame/monaco-vscode-layout-service-override": "2.0.3"
+    "@codingame/monaco-vscode-layout-service-override": "2.1.0"
   }
 }

package/vscode/src/vs/workbench/browser/parts/notifications/notificationsActions.js CHANGED Viewed

@@ -2,7 +2,7 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import './media/notificationsActions.css.js';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { Action } from 'vscode/vscode/vs/base/common/actions';
-import { CLEAR_NOTIFICATION, CLEAR_ALL_NOTIFICATIONS, TOGGLE_DO_NOT_DISTURB_MODE, HIDE_NOTIFICATIONS_CENTER, EXPAND_NOTIFICATION, COLLAPSE_NOTIFICATION } from 'vscode/vscode/vs/workbench/browser/parts/notifications/notificationsCommands';
+import { CLEAR_NOTIFICATION, CLEAR_ALL_NOTIFICATIONS, TOGGLE_DO_NOT_DISTURB_MODE, TOGGLE_DO_NOT_DISTURB_MODE_BY_SOURCE, HIDE_NOTIFICATIONS_CENTER, EXPAND_NOTIFICATION, COLLAPSE_NOTIFICATION } from 'vscode/vscode/vs/workbench/browser/parts/notifications/notificationsCommands';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands';
 import { IClipboardService } from 'vscode/vscode/vs/platform/clipboard/common/clipboardService';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
@@ -98,6 +98,35 @@ let ToggleDoNotDisturbAction = class ToggleDoNotDisturbAction extends Action {
 ToggleDoNotDisturbAction = ( __decorate([
     ( __param(2, ICommandService))
 ], ToggleDoNotDisturbAction));
+let ToggleDoNotDisturbBySourceAction = class ToggleDoNotDisturbBySourceAction extends Action {
+    static { this.ID = TOGGLE_DO_NOT_DISTURB_MODE_BY_SOURCE; }
+    static { this.LABEL = ( localizeWithPath(
+        'vs/workbench/browser/parts/notifications/notificationsActions',
+        'toggleDoNotDisturbModeBySource',
+        "Toggle Do Not Disturb Mode By Source..."
+    )); }
+    constructor(id, label, commandService) {
+        super(id, label);
+        this.commandService = commandService;
+    }
+    async run() {
+        this.commandService.executeCommand(TOGGLE_DO_NOT_DISTURB_MODE_BY_SOURCE);
+    }
+};
+ToggleDoNotDisturbBySourceAction = ( __decorate([
+    ( __param(2, ICommandService))
+], ToggleDoNotDisturbBySourceAction));
+class ConfigureDoNotDisturbAction extends Action {
+    static { this.ID = 'workbench.action.configureDoNotDisturbMode'; }
+    static { this.LABEL = ( localizeWithPath(
+        'vs/workbench/browser/parts/notifications/notificationsActions',
+        'configureDoNotDisturbMode',
+        "Configure Do Not Disturb..."
+    )); }
+    constructor(id, label) {
+        super(id, label, ThemeIcon.asClassName(doNotDisturbIcon));
+    }
+}
 let HideNotificationsCenterAction = class HideNotificationsCenterAction extends Action {
     static { this.ID = HIDE_NOTIFICATIONS_CENTER; }
     static { this.LABEL = ( localizeWithPath(
@@ -159,9 +188,9 @@ class ConfigureNotificationAction extends Action {
         'configureNotification',
         "More Actions..."
     )); }
-    constructor(id, label, configurationActions) {
+    constructor(id, label, notification) {
         super(id, label, ThemeIcon.asClassName(configureIcon));
-        this.configurationActions = configurationActions;
+        this.notification = notification;
     }
 }
 let CopyNotificationMessageAction = class CopyNotificationMessageAction extends Action {
@@ -183,4 +212,4 @@ CopyNotificationMessageAction = ( __decorate([
     ( __param(2, IClipboardService))
 ], CopyNotificationMessageAction));
-export { ClearAllNotificationsAction, ClearNotificationAction, CollapseNotificationAction, ConfigureNotificationAction, CopyNotificationMessageAction, ExpandNotificationAction, HideNotificationsCenterAction, ToggleDoNotDisturbAction };
+export { ClearAllNotificationsAction, ClearNotificationAction, CollapseNotificationAction, ConfigureDoNotDisturbAction, ConfigureNotificationAction, CopyNotificationMessageAction, ExpandNotificationAction, HideNotificationsCenterAction, ToggleDoNotDisturbAction, ToggleDoNotDisturbBySourceAction };

package/vscode/src/vs/workbench/browser/parts/notifications/notificationsCenter.js CHANGED Viewed

@@ -14,19 +14,23 @@ import { widgetShadow } from 'vscode/vscode/vs/platform/theme/common/colorRegist
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { ActionBar } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
-import { ClearAllNotificationsAction, ToggleDoNotDisturbAction, HideNotificationsCenterAction } from './notificationsActions.js';
+import { ConfigureDoNotDisturbAction, ToggleDoNotDisturbAction, ToggleDoNotDisturbBySourceAction, ClearAllNotificationsAction, HideNotificationsCenterAction } from './notificationsActions.js';
+import { toAction, Separator } from 'vscode/vscode/vs/base/common/actions';
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding';
 import { assertIsDefined, assertAllDefined } from 'vscode/vscode/vs/base/common/types';
 import { NotificationsCenterVisibleContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
-import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification';
-import { IAccessibleNotificationService } from 'vscode/vscode/vs/platform/accessibility/common/accessibility';
+import { NotificationsFilter, INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification';
 import { mainWindow } from 'vscode/vscode/vs/base/browser/window';
+import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView';
+import { DropdownMenuActionViewItem } from 'vscode/vscode/vs/base/browser/ui/dropdown/dropdownActionViewItem';
+import { AudioCue, IAudioCueService } from 'vscode/vscode/vs/platform/audioCues/browser/audioCueService';
 var NotificationsCenter_1;
 let NotificationsCenter = class NotificationsCenter extends Themable {
     static { NotificationsCenter_1 = this; }
     static { this.MAX_DIMENSIONS = ( new Dimension(450, 400)); }
-    constructor(container, model, themeService, instantiationService, layoutService, contextKeyService, editorGroupService, keybindingService, notificationService, accessibleNotificationService) {
+    static { this.MAX_NOTIFICATION_SOURCES = 10; }
+    constructor(container, model, themeService, instantiationService, layoutService, contextKeyService, editorGroupService, keybindingService, notificationService, audioCueService, contextMenuService) {
         super(themeService);
         this.container = container;
         this.model = model;
@@ -36,7 +40,8 @@ let NotificationsCenter = class NotificationsCenter extends Themable {
         this.editorGroupService = editorGroupService;
         this.keybindingService = keybindingService;
         this.notificationService = notificationService;
-        this.accessibleNotificationService = accessibleNotificationService;
+        this.audioCueService = audioCueService;
+        this.contextMenuService = contextMenuService;
         this._onDidChangeVisibility = this._register(( new Emitter()));
         this.onDidChangeVisibility = this._onDidChangeVisibility.event;
         this.notificationsCenterVisibleContextKey = NotificationsCenterVisibleContext.bindTo(this.contextKeyService);
@@ -46,10 +51,12 @@ let NotificationsCenter = class NotificationsCenter extends Themable {
     registerListeners() {
         this._register(this.model.onDidChangeNotification(e => this.onDidChangeNotification(e)));
         this._register(this.layoutService.onDidLayoutMainContainer(dimension => this.layout(Dimension.lift(dimension))));
-        this._register(this.notificationService.onDidChangeDoNotDisturbMode(() => this.onDidChangeDoNotDisturbMode()));
+        this._register(this.notificationService.onDidChangeFilter(() => this.onDidChangeFilter()));
     }
-    onDidChangeDoNotDisturbMode() {
-        this.hide();
+    onDidChangeFilter() {
+        if (this.notificationService.getFilter() === NotificationsFilter.ERROR) {
+            this.hide();
+        }
     }
     get isVisible() {
         return !!this._isVisible;
@@ -109,18 +116,69 @@ let NotificationsCenter = class NotificationsCenter extends Themable {
         toolbarContainer.classList.add('notifications-center-header-toolbar');
         this.notificationsCenterHeader.appendChild(toolbarContainer);
         const actionRunner = this._register(this.instantiationService.createInstance(NotificationActionRunner));
+        const that = this;
         const notificationsToolBar = this._register(( new ActionBar(toolbarContainer, {
             ariaLabel: ( localizeWithPath(
                 'vs/workbench/browser/parts/notifications/notificationsCenter',
                 'notificationsToolbar',
                 "Notification Center Actions"
             )),
-            actionRunner
+            actionRunner,
+            actionViewItemProvider: action => {
+                if (action.id === ConfigureDoNotDisturbAction.ID) {
+                    return this._register(this.instantiationService.createInstance(DropdownMenuActionViewItem, action, {
+                        getActions() {
+                            const actions = [toAction({
+                                    id: ToggleDoNotDisturbAction.ID,
+                                    label: that.notificationService.getFilter() === NotificationsFilter.OFF ? ( localizeWithPath(
+                                        'vs/workbench/browser/parts/notifications/notificationsCenter',
+                                        'turnOnNotifications',
+                                        "Enable Do Not Disturb Mode"
+                                    )) : ( localizeWithPath(
+                                        'vs/workbench/browser/parts/notifications/notificationsCenter',
+                                        'turnOffNotifications',
+                                        "Disable Do Not Disturb Mode"
+                                    )),
+                                    run: () => that.notificationService.setFilter(that.notificationService.getFilter() === NotificationsFilter.OFF ? NotificationsFilter.ERROR : NotificationsFilter.OFF)
+                                })];
+                            const sortedFilters = that.notificationService.getFilters().sort((a, b) => a.label.localeCompare(b.label));
+                            for (const source of sortedFilters.slice(0, NotificationsCenter_1.MAX_NOTIFICATION_SOURCES)) {
+                                if (actions.length === 1) {
+                                    actions.push(( new Separator()));
+                                }
+                                actions.push(toAction({
+                                    id: `${ToggleDoNotDisturbAction.ID}.${source.id}`,
+                                    label: source.label,
+                                    checked: source.filter !== NotificationsFilter.ERROR,
+                                    run: () => that.notificationService.setFilter({
+                                        ...source,
+                                        filter: source.filter === NotificationsFilter.ERROR ? NotificationsFilter.OFF : NotificationsFilter.ERROR
+                                    })
+                                }));
+                            }
+                            if (sortedFilters.length > NotificationsCenter_1.MAX_NOTIFICATION_SOURCES) {
+                                actions.push(( new Separator()));
+                                actions.push(that._register(that.instantiationService.createInstance(ToggleDoNotDisturbBySourceAction, ToggleDoNotDisturbBySourceAction.ID, ( localizeWithPath(
+                                    'vs/workbench/browser/parts/notifications/notificationsCenter',
+                                    'moreSources',
+                                    "More…"
+                                )))));
+                            }
+                            return actions;
+                        },
+                    }, this.contextMenuService, {
+                        actionRunner,
+                        classNames: action.class,
+                        keybindingProvider: action => this.keybindingService.lookupKeybinding(action.id)
+                    }));
+                }
+                return undefined;
+            }
         })));
         this.clearAllAction = this._register(this.instantiationService.createInstance(ClearAllNotificationsAction, ClearAllNotificationsAction.ID, ClearAllNotificationsAction.LABEL));
         notificationsToolBar.push(this.clearAllAction, { icon: true, label: false, keybinding: this.getKeybindingLabel(this.clearAllAction) });
-        this.toggleDoNotDisturbAction = this._register(this.instantiationService.createInstance(ToggleDoNotDisturbAction, ToggleDoNotDisturbAction.ID, ToggleDoNotDisturbAction.LABEL));
-        notificationsToolBar.push(this.toggleDoNotDisturbAction, { icon: true, label: false, keybinding: this.getKeybindingLabel(this.toggleDoNotDisturbAction) });
+        this.configureDoNotDisturbAction = this._register(this.instantiationService.createInstance(ConfigureDoNotDisturbAction, ConfigureDoNotDisturbAction.ID, ConfigureDoNotDisturbAction.LABEL));
+        notificationsToolBar.push(this.configureDoNotDisturbAction, { icon: true, label: false });
         const hideAllAction = this._register(this.instantiationService.createInstance(HideNotificationsCenterAction, HideNotificationsCenterAction.ID, HideNotificationsCenterAction.LABEL));
         notificationsToolBar.push(hideAllAction, { icon: true, label: false, keybinding: this.getKeybindingLabel(hideAllAction) });
         this.notificationsList = this.instantiationService.createInstance(NotificationsList, this.notificationsCenterContainer, {
@@ -232,7 +290,7 @@ let NotificationsCenter = class NotificationsCenter extends Themable {
             if (!notification.hasProgress) {
                 notification.close();
             }
-            this.accessibleNotificationService.notify("clear" );
+            this.audioCueService.playAudioCue(AudioCue.clear);
         }
     }
 };
@@ -244,7 +302,8 @@ NotificationsCenter = NotificationsCenter_1 = ( __decorate([
     ( __param(6, IEditorGroupsService)),
     ( __param(7, IKeybindingService)),
     ( __param(8, INotificationService)),
-    ( __param(9, IAccessibleNotificationService))
+    ( __param(9, IAudioCueService)),
+    ( __param(10, IContextMenuService))
 ], NotificationsCenter));
 export { NotificationsCenter };

package/vscode/src/vs/workbench/browser/parts/notifications/notificationsStatus.js CHANGED Viewed

@@ -3,7 +3,7 @@ import { IStatusbarService } from 'vscode/vscode/vs/workbench/services/statusbar
 import { Disposable, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
 import { HIDE_NOTIFICATIONS_CENTER, SHOW_NOTIFICATIONS_CENTER } from 'vscode/vscode/vs/workbench/browser/parts/notifications/notificationsCommands';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
-import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification';
+import { NotificationsFilter, INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification';
 let NotificationsStatus = class NotificationsStatus extends Disposable {
     constructor(model, statusbarService, notificationService) {
@@ -23,7 +23,7 @@ let NotificationsStatus = class NotificationsStatus extends Disposable {
     registerListeners() {
         this._register(this.model.onDidChangeNotification(e => this.onDidChangeNotification(e)));
         this._register(this.model.onDidChangeStatusMessage(e => this.onDidChangeStatusMessage(e)));
-        this._register(this.notificationService.onDidChangeDoNotDisturbMode(() => this.updateNotificationsCenterStatusItem()));
+        this._register(this.notificationService.onDidChangeFilter(() => this.updateNotificationsCenterStatusItem()));
     }
     onDidChangeNotification(e) {
         if (!this.isNotificationsCenterVisible) {
@@ -61,7 +61,7 @@ let NotificationsStatus = class NotificationsStatus extends Disposable {
             tooltip: this.getTooltip(notificationsInProgress),
             showBeak: this.isNotificationsCenterVisible
         };
-        if (this.notificationService.doNotDisturbMode) {
+        if (this.notificationService.getFilter() === NotificationsFilter.ERROR) {
             statusProperties = {
                 ...statusProperties,
                 text: `${notificationsInProgress > 0 || this.newNotificationsCount > 0 ? '$(bell-slash-dot)' : '$(bell-slash)'}`,

package/vscode/src/vs/workbench/browser/parts/notifications/notificationsToasts.js CHANGED Viewed

@@ -66,10 +66,17 @@ let NotificationsToasts = class NotificationsToasts extends Themable {
             this.model.notifications.forEach(notification => this.addToast(notification));
             this._register(this.model.onDidChangeNotification(e => this.onDidChangeNotification(e)));
         });
-        this._register(this.model.onDidChangeFilter(filter => {
-            if (filter === NotificationsFilter.SILENT || filter === NotificationsFilter.ERROR) {
+        this._register(this.model.onDidChangeFilter(({ global, sources }) => {
+            if (global === NotificationsFilter.ERROR) {
                 this.hide();
             }
+            else if (sources) {
+                for (const [notification] of this.mapNotificationToToast) {
+                    if (typeof notification.sourceId === 'string' && sources.get(notification.sourceId) === NotificationsFilter.ERROR && notification.severity !== Severity.Error && notification.priority !== NotificationPriority.URGENT) {
+                        this.removeToast(notification);
+                    }
+                }
+            }
         }));
     }
     onDidChangeNotification(e) {

package/vscode/src/vs/workbench/browser/parts/notifications/notificationsViewer.js CHANGED Viewed

@@ -5,7 +5,7 @@ import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { ButtonBar } from 'vscode/vscode/vs/base/browser/ui/button/button';
 import { ActionBar } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
-import { ActionRunner } from 'vscode/vscode/vs/base/common/actions';
+import { toAction, Separator, ActionRunner } from 'vscode/vscode/vs/base/common/actions';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { DisposableStore, dispose, Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView';
@@ -13,7 +13,7 @@ import { NotificationViewItem, ChoiceAction } from 'vscode/vscode/vs/workbench/c
 import { ConfigureNotificationAction, ClearNotificationAction, ExpandNotificationAction, CollapseNotificationAction } from './notificationsActions.js';
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding';
 import { ProgressBar } from 'vscode/vscode/vs/base/browser/ui/progressbar/progressbar';
-import { Severity } from 'vscode/vscode/vs/platform/notification/common/notification';
+import { isNotificationSource, NotificationsFilter, Severity, INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification';
 import { isNonEmptyArray } from 'vscode/vscode/vs/base/common/arrays';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
@@ -128,10 +128,11 @@ class NotificationMessageRenderer {
 let NotificationRenderer = class NotificationRenderer {
     static { NotificationRenderer_1 = this; }
     static { this.TEMPLATE_ID = 'notification'; }
-    constructor(actionRunner, contextMenuService, instantiationService) {
+    constructor(actionRunner, contextMenuService, instantiationService, notificationService) {
         this.actionRunner = actionRunner;
         this.contextMenuService = contextMenuService;
         this.instantiationService = instantiationService;
+        this.notificationService = notificationService;
     }
     get templateId() {
         return NotificationRenderer_1.TEMPLATE_ID;
@@ -147,6 +148,7 @@ let NotificationRenderer = class NotificationRenderer {
         data.icon.classList.add('notification-list-item-icon', 'codicon');
         data.message = document.createElement('div');
         data.message.classList.add('notification-list-item-message');
+        const that = this;
         const toolbarContainer = document.createElement('div');
         toolbarContainer.classList.add('notification-list-item-toolbar-container');
         data.toolbar = ( new ActionBar(toolbarContainer, {
@@ -156,15 +158,41 @@ let NotificationRenderer = class NotificationRenderer {
                 "Notification Actions"
             )),
             actionViewItemProvider: action => {
-                if (action && action instanceof ConfigureNotificationAction) {
-                    const item = ( new DropdownMenuActionViewItem(
-                        action,
-                        action.configurationActions,
-                        this.contextMenuService,
-                        { actionRunner: this.actionRunner, classNames: action.class }
-                    ));
-                    data.toDispose.add(item);
-                    return item;
+                if (action instanceof ConfigureNotificationAction) {
+                    return data.toDispose.add(( new DropdownMenuActionViewItem(action, {
+                        getActions() {
+                            const actions = [];
+                            const source = { id: action.notification.sourceId, label: action.notification.source };
+                            if (isNotificationSource(source)) {
+                                const isSourceFiltered = that.notificationService.getFilter(source) === NotificationsFilter.ERROR;
+                                actions.push(toAction({
+                                    id: source.id,
+                                    label: isSourceFiltered ? ( localizeWithPath(
+                                        'vs/workbench/browser/parts/notifications/notificationsViewer',
+                                        'turnOnNotifications',
+                                        "Turn On Notifications from '{0}'",
+                                        source.label
+                                    )) : ( localizeWithPath(
+                                        'vs/workbench/browser/parts/notifications/notificationsViewer',
+                                        'turnOffNotifications',
+                                        "Turn Off Notifications from '{0}'",
+                                        source.label
+                                    )),
+                                    run: () => that.notificationService.setFilter({ ...source, filter: isSourceFiltered ? NotificationsFilter.OFF : NotificationsFilter.ERROR })
+                                }));
+                                if (action.notification.actions?.secondary?.length) {
+                                    actions.push(( new Separator()));
+                                }
+                            }
+                            if (Array.isArray(action.notification.actions?.secondary)) {
+                                actions.push(...action.notification.actions.secondary);
+                            }
+                            return actions;
+                        },
+                    }, this.contextMenuService, {
+                        actionRunner: this.actionRunner,
+                        classNames: action.class
+                    })));
                 }
                 return undefined;
             },
@@ -200,7 +228,8 @@ let NotificationRenderer = class NotificationRenderer {
 };
 NotificationRenderer = NotificationRenderer_1 = ( __decorate([
     ( __param(1, IContextMenuService)),
-    ( __param(2, IInstantiationService))
+    ( __param(2, IInstantiationService)),
+    ( __param(3, INotificationService))
 ], NotificationRenderer));
 let NotificationTemplateRenderer = class NotificationTemplateRenderer extends Disposable {
     static { NotificationTemplateRenderer_1 = this; }
@@ -282,9 +311,8 @@ let NotificationTemplateRenderer = class NotificationTemplateRenderer extends Di
     }
     renderSecondaryActions(notification, messageOverflows) {
         const actions = [];
-        const secondaryActions = notification.actions ? notification.actions.secondary : undefined;
-        if (isNonEmptyArray(secondaryActions)) {
-            const configureNotificationAction = this.instantiationService.createInstance(ConfigureNotificationAction, ConfigureNotificationAction.ID, ConfigureNotificationAction.LABEL, secondaryActions);
+        if (isNonEmptyArray(notification.actions?.secondary)) {
+            const configureNotificationAction = this.instantiationService.createInstance(ConfigureNotificationAction, ConfigureNotificationAction.ID, ConfigureNotificationAction.LABEL, notification);
             actions.push(configureNotificationAction);
             this.inputDisposables.add(configureNotificationAction);
         }

package/vscode/src/vs/workbench/services/notification/common/notificationService.js CHANGED Viewed

@@ -1,6 +1,6 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
-import { NotificationsFilter, Severity, NoOpNotification, NeverShowAgainScope } from 'vscode/vscode/vs/platform/notification/common/notification';
+import { isNotificationSource, NotificationsFilter, Severity, NoOpNotification, NeverShowAgainScope } from 'vscode/vscode/vs/platform/notification/common/notification';
 import { NotificationsModel, ChoiceAction } from 'vscode/vscode/vs/workbench/common/notifications';
 import { Disposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
@@ -18,10 +18,17 @@ let NotificationService = class NotificationService extends Disposable {
         this.onDidAddNotification = this._onDidAddNotification.event;
         this._onDidRemoveNotification = this._register(( new Emitter()));
         this.onDidRemoveNotification = this._onDidRemoveNotification.event;
-        this._onDidChangeDoNotDisturbMode = this._register(( new Emitter()));
-        this.onDidChangeDoNotDisturbMode = this._onDidChangeDoNotDisturbMode.event;
-        this._doNotDisturbMode = this.storageService.getBoolean(NotificationService_1.DND_SETTINGS_KEY, -1 , false);
-        this.updateDoNotDisturbFilters();
+        this._onDidChangeFilter = this._register(( new Emitter()));
+        this.onDidChangeFilter = this._onDidChangeFilter.event;
+        this.globalFilterEnabled = this.storageService.getBoolean(NotificationService_1.GLOBAL_FILTER_SETTINGS_KEY, -1 , false);
+        this.mapSourceToFilter = (() => {
+            const map = ( new Map());
+            for (const sourceFilter of this.storageService.getObject(NotificationService_1.PER_SOURCE_FILTER_SETTINGS_KEY, -1 , [])) {
+                map.set(sourceFilter.id, sourceFilter);
+            }
+            return map;
+        })();
+        this.updateFilters();
         this.registerListeners();
     }
     registerListeners() {
@@ -29,13 +36,22 @@ let NotificationService = class NotificationService extends Disposable {
             switch (e.kind) {
                 case 0 :
                 case 3 : {
+                    const source = typeof e.item.sourceId === 'string' && typeof e.item.source === 'string' ? { id: e.item.sourceId, label: e.item.source } : e.item.source;
                     const notification = {
                         message: e.item.message.original,
                         severity: e.item.severity,
-                        source: typeof e.item.sourceId === 'string' && typeof e.item.source === 'string' ? { id: e.item.sourceId, label: e.item.source } : e.item.source,
+                        source,
                         priority: e.item.priority
                     };
                     if (e.kind === 0 ) {
+                        if (isNotificationSource(source)) {
+                            if (!( this.mapSourceToFilter.has(source.id))) {
+                                this.setFilter({ ...source, filter: NotificationsFilter.OFF });
+                            }
+                            else {
+                                this.updateSourceFilter(source);
+                            }
+                        }
                         this._onDidAddNotification.fire(notification);
                     }
                     if (e.kind === 3 ) {
@@ -46,46 +62,85 @@ let NotificationService = class NotificationService extends Disposable {
             }
         }));
     }
-    static { this.DND_SETTINGS_KEY = 'notifications.doNotDisturbMode'; }
-    get doNotDisturbMode() {
-        return this._doNotDisturbMode;
+    static { this.GLOBAL_FILTER_SETTINGS_KEY = 'notifications.doNotDisturbMode'; }
+    static { this.PER_SOURCE_FILTER_SETTINGS_KEY = 'notifications.perSourceDoNotDisturbMode'; }
+    setFilter(filter) {
+        if (typeof filter === 'number') {
+            if (this.globalFilterEnabled === (filter === NotificationsFilter.ERROR)) {
+                return;
+            }
+            this.globalFilterEnabled = filter === NotificationsFilter.ERROR;
+            this.storageService.store(NotificationService_1.GLOBAL_FILTER_SETTINGS_KEY, this.globalFilterEnabled, -1 , 1 );
+            this.updateFilters();
+            this._onDidChangeFilter.fire();
+        }
+        else {
+            const existing = this.mapSourceToFilter.get(filter.id);
+            if (existing?.filter === filter.filter && existing.label === filter.label) {
+                return;
+            }
+            this.mapSourceToFilter.set(filter.id, { id: filter.id, label: filter.label, filter: filter.filter });
+            this.saveSourceFilters();
+            this.updateFilters();
+        }
+    }
+    getFilter(source) {
+        if (source) {
+            return this.mapSourceToFilter.get(source.id)?.filter ?? NotificationsFilter.OFF;
+        }
+        return this.globalFilterEnabled ? NotificationsFilter.ERROR : NotificationsFilter.OFF;
     }
-    set doNotDisturbMode(enabled) {
-        if (this._doNotDisturbMode === enabled) {
+    updateSourceFilter(source) {
+        const existing = this.mapSourceToFilter.get(source.id);
+        if (!existing) {
             return;
         }
-        this.storageService.store(NotificationService_1.DND_SETTINGS_KEY, enabled, -1 , 1 );
-        this._doNotDisturbMode = enabled;
-        this.updateDoNotDisturbFilters();
-        this._onDidChangeDoNotDisturbMode.fire();
-    }
-    updateDoNotDisturbFilters() {
-        let filter;
-        if (this._doNotDisturbMode) {
-            filter = NotificationsFilter.ERROR;
+        if (existing.label !== source.label) {
+            this.mapSourceToFilter.set(source.id, { id: source.id, label: source.label, filter: existing.filter });
+            this.saveSourceFilters();
         }
-        else {
-            filter = NotificationsFilter.OFF;
+    }
+    saveSourceFilters() {
+        this.storageService.store(NotificationService_1.PER_SOURCE_FILTER_SETTINGS_KEY, JSON.stringify([...( this.mapSourceToFilter.values())]), -1 , 1 );
+    }
+    getFilters() {
+        return [...( this.mapSourceToFilter.values())];
+    }
+    updateFilters() {
+        this.model.setFilter({
+            global: this.globalFilterEnabled ? NotificationsFilter.ERROR : NotificationsFilter.OFF,
+            sources: ( new Map(( [...( this.mapSourceToFilter.values())].map(source => [source.id, source.filter]))))
+        });
+    }
+    removeFilter(sourceId) {
+        if (this.mapSourceToFilter.delete(sourceId)) {
+            this.saveSourceFilters();
+            this.updateFilters();
         }
-        this.model.setFilter(filter);
     }
     info(message) {
         if (Array.isArray(message)) {
-            message.forEach(m => this.info(m));
+            for (const messageEntry of message) {
+                this.info(messageEntry);
+            }
             return;
         }
         this.model.addNotification({ severity: Severity.Info, message });
     }
     warn(message) {
         if (Array.isArray(message)) {
-            message.forEach(m => this.warn(m));
+            for (const messageEntry of message) {
+                this.warn(messageEntry);
+            }
             return;
         }
         this.model.addNotification({ severity: Severity.Warning, message });
     }
     error(message) {
         if (Array.isArray(message)) {
-            message.forEach(m => this.error(m));
+            for (const messageEntry of message) {
+                this.error(messageEntry);
+            }
             return;
         }
         this.model.addNotification({ severity: Severity.Error, message });