From 60195b3c5fea72eff3fa6669863cd5555043ce92 Mon Sep 17 00:00:00 2001
From: Dmitry Batrak <Dmitry.Batrak@jetbrains.com>
Date: Wed, 9 Sep 2015 19:13:26 +0300
Subject: [PATCH] EA-68610 - ISE: IntervalTreeImpl.beforeRemove

---
 .../intellij/codeInsight/navigation/CtrlMouseHandler.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/navigation/CtrlMouseHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/navigation/CtrlMouseHandler.java
index 3e93f02fc39f..f710f886c65f 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/navigation/CtrlMouseHandler.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/navigation/CtrlMouseHandler.java
@@ -634,9 +634,10 @@ public class CtrlMouseHandler extends AbstractProjectComponent {
 
   private void disposeHighlighter() {
     if (myHighlighter != null) {
-      myHighlighter.uninstall();
-      HintManager.getInstance().hideAllHints();
+      HighlightersSet highlighter = myHighlighter;
       myHighlighter = null;
+      highlighter.uninstall();
+      HintManager.getInstance().hideAllHints();
     }
   }