IDEA-51739 Code highlight is not updated upon modification

diff --git a/platform/lang-api/src/com/intellij/codeInsight/daemon/LineMarkerInfo.java b/platform/lang-api/src/com/intellij/codeInsight/daemon/LineMarkerInfo.java
index 3ae3a2e1a86706788741603ba1c270e6ca5085f3..f86bf6db78551fba005be426bd5786dafdf13e10 100644 (file)
--- a/platform/lang-api/src/com/intellij/codeInsight/daemon/LineMarkerInfo.java
+++ b/platform/lang-api/src/com/intellij/codeInsight/daemon/LineMarkerInfo.java
@@ -47,7 +47,6 @@ public class LineMarkerInfo<T extends PsiElement> {
   @Nullable private final Function<? super T, String> myTooltipProvider;
   private final GutterIconRenderer.Alignment myIconAlignment;
   @Nullable private final GutterIconNavigationHandler<T> myNavigationHandler;
-  public TextAttributesKey textAttributesKey;
 
 
   public LineMarkerInfo(T element,

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LineMarkersPass.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LineMarkersPass.java
index b70d8223c90d07fd61de8e9a0bdff40b4b117f2f..4b57eeab75a08228b9c58d8301036d15cff14717 100644 (file)
--- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LineMarkersPass.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LineMarkersPass.java
@@ -143,7 +143,6 @@ public class LineMarkersPass extends ProgressableTextEditorHighlightingPass impl
                                          return injectedMarker.getLineMarkerTooltip();
                                        }
                                      }, injectedMarker.getNavigationHandler(), GutterIconRenderer.Alignment.RIGHT);
-              converted.textAttributesKey = injectedMarker.textAttributesKey;
               result.add(converted);
             }
           }

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 7bd8431b23e65f63b2cf93f0229ba77a84e43824..e86552ba77e60be50c13684fcc2fc61de061d00e 100644 (file)
--- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/UpdateHighlightersUtil.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/UpdateHighlightersUtil.java
@@ -399,8 +399,7 @@ public class UpdateHighlightersUtil {
       }
       RangeHighlighter marker = toReuse.reuseHighlighterAt(info.startOffset, info.endOffset);
       if (marker == null) {
-        TextAttributes attributes = info.textAttributesKey == null ? null : colorsScheme.getAttributes(info.textAttributesKey);
-        marker = markupModel.addRangeHighlighter(info.startOffset, info.endOffset, HighlighterLayer.ADDITIONAL_SYNTAX, attributes, HighlighterTargetArea.EXACT_RANGE);
+        marker = markupModel.addRangeHighlighter(info.startOffset, info.endOffset, HighlighterLayer.ADDITIONAL_SYNTAX, null, HighlighterTargetArea.EXACT_RANGE);
       }
       LineMarkerInfo.LineMarkerGutterIconRenderer renderer = (LineMarkerInfo.LineMarkerGutterIconRenderer)info.createGutterRenderer();
       LineMarkerInfo.LineMarkerGutterIconRenderer oldRenderer = marker.getGutterIconRenderer() instanceof LineMarkerInfo.LineMarkerGutterIconRenderer ? (LineMarkerInfo.LineMarkerGutterIconRenderer)marker.getGutterIconRenderer() : null;

diff --git a/xml/impl/src/com/intellij/xml/DefaultXmlExtension.java b/xml/impl/src/com/intellij/xml/DefaultXmlExtension.java
index 26f740e8618bf38754518b68209ec5d6fbfa5b40..985295a8ad62d1fd5c27c8bf682bf4be9bf5cd43 100644 (file)
--- a/xml/impl/src/com/intellij/xml/DefaultXmlExtension.java
+++ b/xml/impl/src/com/intellij/xml/DefaultXmlExtension.java
@@ -244,7 +244,7 @@ public class DefaultXmlExtension extends XmlExtension {
     @NonNls String nsDeclarationAttrName = null;
     for(XmlTag t = context; t != null; t = t.getParentTag()) {
       if (t.hasNamespaceDeclarations()) {
-        if (nsDeclarationAttrName == null) nsDeclarationAttrName = "xmlns:"+namespacePrefix;
+        if (nsDeclarationAttrName == null) nsDeclarationAttrName = namespacePrefix.length() > 0 ? "xmlns:"+namespacePrefix:"xmlns";
         if (t.getAttributeValue(nsDeclarationAttrName) != null) return true;
       }
     }