From 2e0919f07ca8d60f8cbffeb87248327e4be2b93b Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Fri, 24 Sep 2010 13:23:14 +0400
Subject: [PATCH] do not rewrite file level highlightings

---
 .../daemon/impl/UpdateHighlightersUtil.java         | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/UpdateHighlightersUtil.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/UpdateHighlightersUtil.java
index 185de4885ce6..38ce4cb2b110 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/UpdateHighlightersUtil.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/UpdateHighlightersUtil.java
@@ -116,6 +116,8 @@ public class UpdateHighlightersUtil {
                                              int endOffset,
                                              @NotNull Collection<HighlightInfo> highlights,
                                              int group) {
+    PsiFile psiFile = PsiDocumentManager.getInstance(project).getPsiFile(document);
+    cleanFileLevelHighlights(project, group, psiFile);
     setHighlightersToEditor(project, document, Collections.singletonMap(new TextRange(startOffset, endOffset), highlights), group);
   }
 
@@ -192,15 +194,12 @@ public class UpdateHighlightersUtil {
     assertMarkupConsistent(markup, project);
   }
 
-  public static void setHighlightersToEditor(@NotNull Project project,
-                                             @NotNull Document document,
-                                             @NotNull Map<TextRange, Collection<HighlightInfo>> infos,
-                                             final int group) {
+  static void setHighlightersToEditor(@NotNull Project project,
+                                      @NotNull Document document,
+                                      @NotNull Map<TextRange, Collection<HighlightInfo>> infos,
+                                      final int group) {
     ApplicationManager.getApplication().assertIsDispatchThread();
 
-    PsiFile psiFile = PsiDocumentManager.getInstance(project).getPsiFile(document);
-    cleanFileLevelHighlights(project, group, psiFile);
-
     final List<TextRange> ranges = new ArrayList<TextRange>(infos.keySet());
     Collections.sort(ranges, BY_START_OFFSET);
     //merge intersecting