From 19dde982dcec9d8cbd1da491f155ebb6202b67d8 Mon Sep 17 00:00:00 2001
From: Peter Gromov <peter@jetbrains.com>
Date: Wed, 18 Dec 2019 21:12:15 +0100
Subject: [PATCH] EditorMouseHoverPopupManager: prevent races (IDEA-CR-56548)

GitOrigin-RevId: 5dbea4e04b3f995199a43061a975d9e362829c89
---
 .../openapi/editor/EditorMouseHoverPopupManager.java        | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/platform/lang-impl/src/com/intellij/openapi/editor/EditorMouseHoverPopupManager.java b/platform/lang-impl/src/com/intellij/openapi/editor/EditorMouseHoverPopupManager.java
index 1895f3fdd1ce..86513faaa952 100644
--- a/platform/lang-impl/src/com/intellij/openapi/editor/EditorMouseHoverPopupManager.java
+++ b/platform/lang-impl/src/com/intellij/openapi/editor/EditorMouseHoverPopupManager.java
@@ -221,7 +221,11 @@ public final class EditorMouseHoverPopupManager implements Disposable {
         .submit(AppExecutorUtil.getAppExecutorService());
 
       myCurrentProgress = promise;
-      promise.onProcessed(__ -> UIUtil.invokeLaterIfNeeded(() -> myCurrentProgress = null));
+      promise.onProcessed(__ -> UIUtil.invokeLaterIfNeeded(() -> {
+        if (myCurrentProgress == promise) {
+          myCurrentProgress = null;
+        }
+      }));
     }, context.getShowingDelay());
   }