@codingame/monaco-vscode-notifications-service-override 1.85.0 → 1.85.2

package/notifications.js

@@ -9,6 +9,7 @@ import { NotificationsCenter } from './vscode/src/vs/workbench/browser/parts/not
 import { NotificationsAlerts } from './vscode/src/vs/workbench/browser/parts/notifications/notificationsAlerts.js';
 import { NotificationsTelemetry } from 'vscode/vscode/vs/workbench/browser/parts/notifications/notificationsTelemetry';
 import { ILayoutService } from 'monaco-editor/esm/vs/platform/layout/browser/layoutService.js';
+import { NotificationsStatus } from './vscode/src/vs/workbench/browser/parts/notifications/notificationsStatus.js';
 import getServiceOverride$1 from '@codingame/monaco-vscode-layout-service-override';
 import { onRenderWorkbench } from 'vscode/lifecycle';
 
@@ -20,7 +21,15 @@ onRenderWorkbench(async (accessor) => {
         const notificationsCenter = instantiationService.createInstance(NotificationsCenter, container, model);
         const notificationsToasts = instantiationService.createInstance(NotificationsToasts, container, model);
         instantiationService.createInstance(NotificationsAlerts, model);
+        const notificationsStatus = instantiationService.createInstance(NotificationsStatus, model);
         instantiationService.createInstance(NotificationsTelemetry);
+        notificationsCenter.onDidChangeVisibility(() => {
+            notificationsStatus.update(notificationsCenter.isVisible, notificationsToasts.isVisible);
+            notificationsToasts.update(notificationsCenter.isVisible);
+        });
+        notificationsToasts.onDidChangeVisibility(() => {
+            notificationsStatus.update(notificationsCenter.isVisible, notificationsToasts.isVisible);
+        });
         registerNotificationCommands(notificationsCenter, notificationsToasts, model);
         notificationsToasts.layout(dom.getClientArea(container));
     });

package/package.json

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

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

@@ -0,0 +1,220 @@
+import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
+import { IStatusbarService } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar';
+import { Disposable, dispose } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { HIDE_NOTIFICATIONS_CENTER, SHOW_NOTIFICATIONS_CENTER } from 'vscode/vscode/vs/workbench/browser/parts/notifications/notificationsCommands';
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
+import { INotificationService } from 'monaco-editor/esm/vs/platform/notification/common/notification.js';
+
+let NotificationsStatus = class NotificationsStatus extends Disposable {
+    constructor(model, statusbarService, notificationService) {
+        super();
+        this.model = model;
+        this.statusbarService = statusbarService;
+        this.notificationService = notificationService;
+        this.newNotificationsCount = 0;
+        this.isNotificationsCenterVisible = false;
+        this.isNotificationsToastsVisible = false;
+        this.updateNotificationsCenterStatusItem();
+        if (model.statusMessage) {
+            this.doSetStatusMessage(model.statusMessage);
+        }
+        this.registerListeners();
+    }
+    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()));
+    }
+    onDidChangeNotification(e) {
+        if (!this.isNotificationsCenterVisible) {
+            if (e.kind === 0 ) {
+                this.newNotificationsCount++;
+            }
+            else if (e.kind === 3  && this.newNotificationsCount > 0) {
+                this.newNotificationsCount--;
+            }
+        }
+        this.updateNotificationsCenterStatusItem();
+    }
+    updateNotificationsCenterStatusItem() {
+        let notificationsInProgress = 0;
+        if (!this.isNotificationsCenterVisible && !this.isNotificationsToastsVisible) {
+            for (const notification of this.model.notifications) {
+                if (notification.hasProgress) {
+                    notificationsInProgress++;
+                }
+            }
+        }
+        let statusProperties = {
+            name: ( localizeWithPath(
+                'vs/workbench/browser/parts/notifications/notificationsStatus',
+                'status.notifications',
+                "Notifications"
+            )),
+            text: `${notificationsInProgress > 0 || this.newNotificationsCount > 0 ? '$(bell-dot)' : '$(bell)'}`,
+            ariaLabel: ( localizeWithPath(
+                'vs/workbench/browser/parts/notifications/notificationsStatus',
+                'status.notifications',
+                "Notifications"
+            )),
+            command: this.isNotificationsCenterVisible ? HIDE_NOTIFICATIONS_CENTER : SHOW_NOTIFICATIONS_CENTER,
+            tooltip: this.getTooltip(notificationsInProgress),
+            showBeak: this.isNotificationsCenterVisible
+        };
+        if (this.notificationService.doNotDisturbMode) {
+            statusProperties = {
+                ...statusProperties,
+                text: `${notificationsInProgress > 0 || this.newNotificationsCount > 0 ? '$(bell-slash-dot)' : '$(bell-slash)'}`,
+                ariaLabel: ( localizeWithPath(
+                    'vs/workbench/browser/parts/notifications/notificationsStatus',
+                    'status.doNotDisturb',
+                    "Do Not Disturb"
+                )),
+                tooltip: ( localizeWithPath(
+                    'vs/workbench/browser/parts/notifications/notificationsStatus',
+                    'status.doNotDisturbTooltip',
+                    "Do Not Disturb Mode is Enabled"
+                ))
+            };
+        }
+        if (!this.notificationsCenterStatusItem) {
+            this.notificationsCenterStatusItem = this.statusbarService.addEntry(statusProperties, 'status.notifications', 1 , -Number.MAX_VALUE );
+        }
+        else {
+            this.notificationsCenterStatusItem.update(statusProperties);
+        }
+    }
+    getTooltip(notificationsInProgress) {
+        if (this.isNotificationsCenterVisible) {
+            return ( localizeWithPath(
+                'vs/workbench/browser/parts/notifications/notificationsStatus',
+                'hideNotifications',
+                "Hide Notifications"
+            ));
+        }
+        if (this.model.notifications.length === 0) {
+            return ( localizeWithPath(
+                'vs/workbench/browser/parts/notifications/notificationsStatus',
+                'zeroNotifications',
+                "No Notifications"
+            ));
+        }
+        if (notificationsInProgress === 0) {
+            if (this.newNotificationsCount === 0) {
+                return ( localizeWithPath(
+                    'vs/workbench/browser/parts/notifications/notificationsStatus',
+                    'noNotifications',
+                    "No New Notifications"
+                ));
+            }
+            if (this.newNotificationsCount === 1) {
+                return ( localizeWithPath(
+                    'vs/workbench/browser/parts/notifications/notificationsStatus',
+                    'oneNotification',
+                    "1 New Notification"
+                ));
+            }
+            return ( localizeWithPath(
+                'vs/workbench/browser/parts/notifications/notificationsStatus',
+                { key: 'notifications', comment: ['{0} will be replaced by a number'] },
+                "{0} New Notifications",
+                this.newNotificationsCount
+            ));
+        }
+        if (this.newNotificationsCount === 0) {
+            return ( localizeWithPath(
+                'vs/workbench/browser/parts/notifications/notificationsStatus',
+                { key: 'noNotificationsWithProgress', comment: ['{0} will be replaced by a number'] },
+                "No New Notifications ({0} in progress)",
+                notificationsInProgress
+            ));
+        }
+        if (this.newNotificationsCount === 1) {
+            return ( localizeWithPath(
+                'vs/workbench/browser/parts/notifications/notificationsStatus',
+                { key: 'oneNotificationWithProgress', comment: ['{0} will be replaced by a number'] },
+                "1 New Notification ({0} in progress)",
+                notificationsInProgress
+            ));
+        }
+        return ( localizeWithPath(
+            'vs/workbench/browser/parts/notifications/notificationsStatus',
+            { key: 'notificationsWithProgress', comment: ['{0} and {1} will be replaced by a number'] },
+            "{0} New Notifications ({1} in progress)",
+            this.newNotificationsCount,
+            notificationsInProgress
+        ));
+    }
+    update(isCenterVisible, isToastsVisible) {
+        let updateNotificationsCenterStatusItem = false;
+        if (this.isNotificationsCenterVisible !== isCenterVisible) {
+            this.isNotificationsCenterVisible = isCenterVisible;
+            this.newNotificationsCount = 0;
+            updateNotificationsCenterStatusItem = true;
+        }
+        if (this.isNotificationsToastsVisible !== isToastsVisible) {
+            this.isNotificationsToastsVisible = isToastsVisible;
+            updateNotificationsCenterStatusItem = true;
+        }
+        if (updateNotificationsCenterStatusItem) {
+            this.updateNotificationsCenterStatusItem();
+        }
+    }
+    onDidChangeStatusMessage(e) {
+        const statusItem = e.item;
+        switch (e.kind) {
+            case 0 :
+                this.doSetStatusMessage(statusItem);
+                break;
+            case 1 :
+                if (this.currentStatusMessage && this.currentStatusMessage[0] === statusItem) {
+                    dispose(this.currentStatusMessage[1]);
+                    this.currentStatusMessage = undefined;
+                }
+                break;
+        }
+    }
+    doSetStatusMessage(item) {
+        const message = item.message;
+        const showAfter = item.options && typeof item.options.showAfter === 'number' ? item.options.showAfter : 0;
+        const hideAfter = item.options && typeof item.options.hideAfter === 'number' ? item.options.hideAfter : -1;
+        if (this.currentStatusMessage) {
+            dispose(this.currentStatusMessage[1]);
+        }
+        let statusMessageEntry;
+        let showHandle = setTimeout(() => {
+            statusMessageEntry = this.statusbarService.addEntry({
+                name: ( localizeWithPath(
+                    'vs/workbench/browser/parts/notifications/notificationsStatus',
+                    'status.message',
+                    "Status Message"
+                )),
+                text: message,
+                ariaLabel: message
+            }, 'status.message', 0 , -Number.MAX_VALUE );
+            showHandle = null;
+        }, showAfter);
+        let hideHandle;
+        const statusMessageDispose = {
+            dispose: () => {
+                if (showHandle) {
+                    clearTimeout(showHandle);
+                }
+                if (hideHandle) {
+                    clearTimeout(hideHandle);
+                }
+                statusMessageEntry?.dispose();
+            }
+        };
+        if (hideAfter > 0) {
+            hideHandle = setTimeout(() => statusMessageDispose.dispose(), hideAfter);
+        }
+        this.currentStatusMessage = [item, statusMessageDispose];
+    }
+};
+NotificationsStatus = ( __decorate([
+    ( __param(1, IStatusbarService)),
+    ( __param(2, INotificationService))
+], NotificationsStatus));
+
+export { NotificationsStatus };