From 1ff1cc37d50c45efe0de2189eeb9ed65bb500995 Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <AMPivovarov@gmail.com>
Date: Mon, 5 Oct 2015 15:44:59 +0300
Subject: [PATCH] IDEA-145925 diff: do not open multiple "Go To Change" popups

---
 .../actions/impl/GoToChangePopupBuilder.java  | 24 +++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/platform/diff-impl/src/com/intellij/diff/actions/impl/GoToChangePopupBuilder.java b/platform/diff-impl/src/com/intellij/diff/actions/impl/GoToChangePopupBuilder.java
index 9844add98e27..5827823e6878 100644
--- a/platform/diff-impl/src/com/intellij/diff/actions/impl/GoToChangePopupBuilder.java
+++ b/platform/diff-impl/src/com/intellij/diff/actions/impl/GoToChangePopupBuilder.java
@@ -19,10 +19,9 @@ import com.intellij.diff.chains.DiffRequestChain;
 import com.intellij.diff.chains.DiffRequestProducer;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.openapi.ui.popup.JBPopup;
-import com.intellij.openapi.ui.popup.JBPopupFactory;
-import com.intellij.openapi.ui.popup.PopupStep;
+import com.intellij.openapi.ui.popup.*;
 import com.intellij.openapi.ui.popup.util.BaseListPopupStep;
+import com.intellij.openapi.util.Key;
 import com.intellij.ui.awt.RelativePoint;
 import com.intellij.util.Consumer;
 import org.jetbrains.annotations.NotNull;
@@ -31,6 +30,8 @@ import java.awt.event.InputEvent;
 import java.awt.event.MouseEvent;
 
 public class GoToChangePopupBuilder {
+  private static final Key<JBPopup> POPUP_KEY = Key.create("Diff.RequestChainGoToPopup");
+
   public interface Chain extends DiffRequestChain {
     @NotNull
     AnAction createGoToChangeAction(@NotNull Consumer<Integer> onSelected);
@@ -65,7 +66,22 @@ public class GoToChangePopupBuilder {
 
     @Override
     public void actionPerformed(@NotNull AnActionEvent e) {
-      JBPopup popup = createPopup(e);
+      JBPopup oldPopup = myChain.getUserData(POPUP_KEY);
+      if (oldPopup != null && oldPopup.isVisible()) {
+        oldPopup.cancel();
+      }
+
+      final JBPopup popup = createPopup(e);
+
+      myChain.putUserData(POPUP_KEY, popup);
+      popup.addListener(new JBPopupAdapter() {
+        @Override
+        public void onClosed(LightweightWindowEvent event) {
+          if (myChain.getUserData(POPUP_KEY) == popup) {
+            myChain.putUserData(POPUP_KEY, null);
+          }
+        }
+      });
 
       InputEvent event = e.getInputEvent();
       if (event instanceof MouseEvent) {