From 2b5d768064c211e865b031a9d0dc86b2a4c47766 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Fri, 16 Dec 2011 15:56:16 +0100
Subject: [PATCH] IDEA-78075 Notifications: notifications with 'log=false'
 should expire when closed or hidden

---
 .../impl/NotificationsManagerImpl.java        | 34 +++++++++++++++----
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/notification/impl/NotificationsManagerImpl.java b/platform/platform-impl/src/com/intellij/notification/impl/NotificationsManagerImpl.java
index c349a82ff8dd..9e7841e21960 100644
--- a/platform/platform-impl/src/com/intellij/notification/impl/NotificationsManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/notification/impl/NotificationsManagerImpl.java
@@ -136,11 +136,20 @@ public class NotificationsManagerImpl extends NotificationsManager implements No
     }
 
     final NotificationSettings settings = NotificationsConfigurationImpl.getSettings(notification.getGroupId());
-    if (settings.isShouldLog() && settings.getDisplayType() != NotificationDisplayType.NONE) {
+    boolean shouldLog = settings.isShouldLog();
+    boolean displayable = settings.getDisplayType() != NotificationDisplayType.NONE;
+    if (shouldLog && displayable) {
       myModel.add(notification, project);
     }
 
-    showWhenVisible(notification, project);
+    boolean willBeShown = displayable && NotificationsConfigurationImpl.getNotificationsConfigurationImpl().SHOW_BALLOONS;
+    if (!shouldLog && !willBeShown) {
+      notification.expire();
+    }
+
+    if (NotificationsConfigurationImpl.getNotificationsConfigurationImpl().SHOW_BALLOONS) {
+      showWhenVisible(notification, project);
+    }
   }
 
   private static void showWhenVisible(final Notification notification, final Project project) {
@@ -187,8 +196,18 @@ public class NotificationsManagerImpl extends NotificationsManager implements No
       case STICKY_BALLOON:
       case BALLOON:
       default:
-        if (NotificationsConfigurationImpl.getNotificationsConfigurationImpl().SHOW_BALLOONS) {
-          notifyByBalloon(notification, type, project);
+        Balloon balloon = notifyByBalloon(notification, type, project);
+        if (!settings.isShouldLog()) {
+          if (balloon == null) {
+            notification.expire();
+          } else {
+            balloon.addListener(new JBPopupAdapter() {
+              @Override
+              public void onClosed(LightweightWindowEvent event) {
+                notification.expire();
+              }
+            });
+          }
         }
         break;
       case TOOL_WINDOW:
@@ -216,10 +235,11 @@ public class NotificationsManagerImpl extends NotificationsManager implements No
     }
   }
 
-  private static void notifyByBalloon(final Notification notification,
+  @Nullable
+  private static Balloon notifyByBalloon(final Notification notification,
                                       final NotificationDisplayType displayType,
                                       @Nullable final Project project) {
-    if (ApplicationManager.getApplication().isUnitTestMode()) return;
+    if (ApplicationManager.getApplication().isUnitTestMode()) return null;
 
     Window window = findWindowForBalloon(project);
     if (window instanceof IdeFrameImpl) {
@@ -240,7 +260,9 @@ public class NotificationsManagerImpl extends NotificationsManager implements No
           }
         });
       }
+      return balloon;
     }
+    return null;
   }
 
   @Nullable