Always resolve existing before showing new notification (#13668)

eclipse-theia · Jun 20, 2024 · c2be137 · c2be137
1 parent 7767e54
commit c2be137
Showing 1 changed file with 16 additions and 11 deletions.
diff --git a/packages/messages/src/browser/notifications-manager.ts b/packages/messages/src/browser/notifications-manager.ts
@@ -180,18 +180,23 @@ export class NotificationManager extends MessageClient {
     override showMessage(plainMessage: PlainMessage): Promise<string | undefined> {
         const messageId = this.getMessageId(plainMessage);
 
-        let notification = this.notifications.get(messageId);
-        if (!notification) {
-            const message = this.contentRenderer.renderMessage(plainMessage.text);
-            const type = this.toNotificationType(plainMessage.type);
-            const actions = Array.from(new Set(plainMessage.actions));
-            const source = plainMessage.source;
-            const expandable = this.isExpandable(message, source, actions);
-            const collapsed = expandable;
-            notification = { messageId, message, type, actions, expandable, collapsed };
-            this.notifications.set(messageId, notification);
+        this.toasts.delete(messageId);
+        this.notifications.delete(messageId);
+        const existingDeferred = this.deferredResults.get(messageId);
+        if (existingDeferred) {
+            this.deferredResults.delete(messageId);
+            existingDeferred.resolve(undefined);
         }
-        const result = this.deferredResults.get(messageId) || new Deferred<string | undefined>();
+
+        const message = this.contentRenderer.renderMessage(plainMessage.text);
+        const type = this.toNotificationType(plainMessage.type);
+        const actions = Array.from(new Set(plainMessage.actions));
+        const source = plainMessage.source;
+        const expandable = this.isExpandable(message, source, actions);
+        const collapsed = expandable;
+        const notification = { messageId, message, type, actions, expandable, collapsed };
+        this.notifications.set(messageId, notification);
+        const result = new Deferred<string | undefined>();
         this.deferredResults.set(messageId, result);
 
         if (!this.centerVisible) {