MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Revert "collect dangling whitespaces and data characters under xmlText (WEB-28313)"

Browse Source 
This reverts commit 2b99edb
This commit is contained in:
Dennis Ushakov
2017-10-12 22:44:04 +03:00
parent 103b05cebf
commit 91bd862fca
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xml/xml-psi-impl/src/com/intellij/lang/html/HtmlParsing.java
+4 -8
View File
@@ -60,36 +60,29 @@ public class HtmlParsing {
parseProlog();
PsiBuilder.Marker error = null;
PsiBuilder.Marker xmlText = null;
while (!eof()) {
final IElementType tt = token();
if (tt == XmlTokenType.XML_START_TAG_START) {
error = flushError(error);
xmlText = terminateText(xmlText);
parseTag();
myTagMarkersStack.clear();
myTagNamesStack.clear();
}
else if (tt == XmlTokenType.XML_COMMENT_START) {
error = flushError(error);
xmlText = startText(xmlText);
parseComment();
}
else if (tt == XmlTokenType.XML_PI_START) {
error = flushError(error);
xmlText = terminateText(xmlText);
parseProcessingInstruction();
}
else if (tt == XmlTokenType.XML_CHAR_ENTITY_REF || tt == XmlTokenType.XML_ENTITY_REF_TOKEN) {
xmlText = startText(xmlText);
parseReference();
}
else if (tt == XmlTokenType.XML_REAL_WHITE_SPACE || tt == XmlTokenType.XML_DATA_CHARACTERS) {
error = flushError(error);
xmlText = startText(xmlText);
advance();
} else if (tt == XmlTokenType.XML_END_TAG_START) {
xmlText = terminateText(xmlText);
final PsiBuilder.Marker tagEndError = myBuilder.mark();
advance();
@@ -107,7 +100,7 @@ public class HtmlParsing {
advance();
}
}
terminateText(xmlText);
if (error != null) {
error.error(XmlErrorMessages.message("top.level.element.is.not.completed"));
}
@@ -283,6 +276,9 @@ 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 || token() == XmlTokenType.XML_DATA_CHARACTERS) && !hasTags()) {
xmlText = terminateText(xmlText);
advance();
} else {
xmlText = startText(xmlText);
advance();