EA-68610 - ISE: IntervalTreeImpl.beforeRemove

diff --git a/platform/platform-impl/src/com/intellij/codeInsight/hint/HintManagerImpl.java b/platform/platform-impl/src/com/intellij/codeInsight/hint/HintManagerImpl.java
index 91d1e80bdd06b6f1483923e452b58d5120675121..28160753c7175caf52cfab2881a1d9f5dd258913 100644 (file)
--- a/platform/platform-impl/src/com/intellij/codeInsight/hint/HintManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/codeInsight/hint/HintManagerImpl.java
@@ -792,13 +792,13 @@ public class HintManagerImpl extends HintManager implements Disposable {
     hint.addHintListener(new HintListener() {
       @Override
       public void hintHidden(EventObject event) {
+        hint.removeHintListener(this);
         highlighter.dispose();
 
         if (myQuestionHint == hint) {
           myQuestionAction = null;
           myQuestionHint = null;
         }
-        hint.removeHintListener(this);
       }
     });