From 2b349f9a7a2ae2c722117b2bb962ce27c245f41a Mon Sep 17 00:00:00 2001 From: peter Date: Fri, 7 Dec 2018 20:48:56 +0100 Subject: [PATCH] fix xml/html attribute name highlighting --- .../src/com/intellij/ide/highlighter/HtmlFileHighlighter.java | 3 ++- .../src/com/intellij/ide/highlighter/XmlFileHighlighter.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/xml/xml-psi-impl/src/com/intellij/ide/highlighter/HtmlFileHighlighter.java b/xml/xml-psi-impl/src/com/intellij/ide/highlighter/HtmlFileHighlighter.java index ca91fdfdacae..1c733788b0b4 100644 --- a/xml/xml-psi-impl/src/com/intellij/ide/highlighter/HtmlFileHighlighter.java +++ b/xml/xml-psi-impl/src/com/intellij/ide/highlighter/HtmlFileHighlighter.java @@ -50,7 +50,8 @@ public class HtmlFileHighlighter extends SyntaxHighlighterBase { } ourMap.putValues(XML_TAG_NAME, Arrays.asList(XmlHighlighterColors.HTML_TAG, XmlHighlighterColors.HTML_TAG_NAME)); - for (IElementType type : ContainerUtil.ar(XML_NAME, XML_EQ, + ourMap.putValues(XML_NAME, Arrays.asList(XmlHighlighterColors.HTML_TAG, XmlHighlighterColors.HTML_ATTRIBUTE_NAME)); + for (IElementType type : ContainerUtil.ar(XML_EQ, XML_ATTRIBUTE_VALUE_TOKEN, XML_ATTRIBUTE_VALUE_START_DELIMITER, XML_ATTRIBUTE_VALUE_END_DELIMITER)) { ourMap.putValues(type, Arrays.asList(XmlHighlighterColors.HTML_TAG, XmlHighlighterColors.HTML_ATTRIBUTE_VALUE)); } diff --git a/xml/xml-psi-impl/src/com/intellij/ide/highlighter/XmlFileHighlighter.java b/xml/xml-psi-impl/src/com/intellij/ide/highlighter/XmlFileHighlighter.java index 0051caa3063a..9bcd77522949 100644 --- a/xml/xml-psi-impl/src/com/intellij/ide/highlighter/XmlFileHighlighter.java +++ b/xml/xml-psi-impl/src/com/intellij/ide/highlighter/XmlFileHighlighter.java @@ -53,7 +53,8 @@ public class XmlFileHighlighter extends SyntaxHighlighterBase { for (IElementType type : ContainerUtil.ar(XML_TAG_NAME, XML_CONDITIONAL_IGNORE, XML_CONDITIONAL_INCLUDE)) { ourMap.putValues(type, Arrays.asList(XmlHighlighterColors.XML_TAG, XmlHighlighterColors.XML_TAG_NAME)); } - for (IElementType type : ContainerUtil.ar(XML_NAME, XML_EQ, XML_TAG_CHARACTERS, + ourMap.putValues(XML_NAME, Arrays.asList(XmlHighlighterColors.XML_TAG, XmlHighlighterColors.XML_ATTRIBUTE_NAME)); + for (IElementType type : ContainerUtil.ar(XML_EQ, XML_TAG_CHARACTERS, XML_ATTRIBUTE_VALUE_TOKEN, XML_ATTRIBUTE_VALUE_START_DELIMITER, XML_ATTRIBUTE_VALUE_END_DELIMITER)) { ourMap.putValues(type, Arrays.asList(XmlHighlighterColors.XML_TAG, XmlHighlighterColors.XML_ATTRIBUTE_VALUE)); }