From 103b05cebffcfff02b7d9d8a76b08fd978d49083 Mon Sep 17 00:00:00 2001 From: Dennis Ushakov Date: Thu, 12 Oct 2017 22:36:19 +0300 Subject: [PATCH] Revert "split xml text out of tags on whitespaces" This reverts commit c003f3c --- .../src/com/intellij/lang/html/HtmlParsing.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) 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 c2ed305dcde8..8f9295bc1269 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 @@ -84,12 +84,7 @@ public class HtmlParsing { xmlText = startText(xmlText); parseReference(); } - else if (tt == XmlTokenType.XML_REAL_WHITE_SPACE) { - error = flushError(error); - xmlText = terminateText(xmlText); - advance(); - } - else if (tt == XmlTokenType.XML_DATA_CHARACTERS) { + else if (tt == XmlTokenType.XML_REAL_WHITE_SPACE || tt == XmlTokenType.XML_DATA_CHARACTERS) { error = flushError(error); xmlText = startText(xmlText); advance(); @@ -288,9 +283,6 @@ public class HtmlParsing { error(XmlErrorMessages.message("xml.parsing.closing.tag.is.not.done")); } if (hasTags()) doneTag(myTagMarkersStack.peek()); - } else if (token() == XmlTokenType.XML_REAL_WHITE_SPACE && !hasTags()) { - xmlText = terminateText(xmlText); - advance(); } else { xmlText = startText(xmlText); advance();