From 0dafbe683ec8af37e740ff7e55c2c79f9619688a Mon Sep 17 00:00:00 2001 From: Dennis Ushakov Date: Mon, 15 Sep 2014 16:08:24 +0400 Subject: [PATCH] parse entities within comments properly #WEB-13290 fixed --- .../src/com/intellij/lang/html/HtmlParsing.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xml/xml-psi-impl/src/com/intellij/lang/html/HtmlParsing.java b/xml/xml-psi-impl/src/com/intellij/lang/html/HtmlParsing.java index 55ab6d28fdd8..82c1dff7aabb 100644 --- a/xml/xml-psi-impl/src/com/intellij/lang/html/HtmlParsing.java +++ b/xml/xml-psi-impl/src/com/intellij/lang/html/HtmlParsing.java @@ -449,12 +449,16 @@ public class HtmlParsing { advance(); while (true) { final IElementType tt = token(); - if (tt == XmlTokenType.XML_COMMENT_CHARACTERS || tt == XmlTokenType.XML_CHAR_ENTITY_REF || tt == XmlTokenType.XML_CONDITIONAL_COMMENT_START + if (tt == XmlTokenType.XML_COMMENT_CHARACTERS || tt == XmlTokenType.XML_CONDITIONAL_COMMENT_START || tt == XmlTokenType.XML_CONDITIONAL_COMMENT_START_END || tt == XmlTokenType.XML_CONDITIONAL_COMMENT_END_START || tt == XmlTokenType.XML_CONDITIONAL_COMMENT_END) { advance(); continue; } + if (tt == XmlTokenType.XML_ENTITY_REF_TOKEN || tt == XmlTokenType.XML_CHAR_ENTITY_REF) { + parseReference(); + continue; + } if (tt == XmlTokenType.XML_BAD_CHARACTER) { final PsiBuilder.Marker error = mark(); advance();