MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-08 15:09:39 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-49806 html parsing bug with script / xmp

Browse Source
This commit is contained in:
Maxim.Mossienko
2011-10-26 21:06:57 +04:00
parent bcd563df1d
commit e929a73778
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
xml/impl/src/com/intellij/lexer/BaseHtmlLexer.java
View File

@@ -60,9 +60,6 @@ abstract class BaseHtmlLexer extends DelegateLexer {
public void handleElement(Lexer lexer) {
final CharSequence buffer = lexer.getBufferSequence();
final char firstCh = buffer.charAt(lexer.getTokenStart());
// support for style in any attribute that ends with style
//final int i = lexer.getTokenEnd() - "style".length();
//final char ch = i > lexer.getTokenStart() ? buffer[i]:firstCh;
if (seenScript && !seenTag) {
seenContentType = false;
@@ -79,9 +76,8 @@ abstract class BaseHtmlLexer extends DelegateLexer {
return;
}
if ( /*ch !='s' &&*/
firstCh !='o' && firstCh !='s' &&
(!caseInsensitive || (/*ch !='S' &&*/ firstCh !='S' && firstCh !='O') )
if (firstCh !='o' && firstCh !='s' &&
(!caseInsensitive || (firstCh !='S' && firstCh !='O') )
) {
return; // optimization
}
@@ -89,7 +85,7 @@ abstract class BaseHtmlLexer extends DelegateLexer {
String name = TreeUtil.getTokenText(lexer);
if (caseInsensitive) name = name.toLowerCase();
final boolean style = name.equals(TOKEN_STYLE); //name.endsWith("style");
final boolean style = name.equals(TOKEN_STYLE);
final int state = getState() & BASE_STATE_MASK;
final boolean script = name.equals(TOKEN_SCRIPT) ||
((name.startsWith(TOKEN_ON) && name.indexOf(':') == -1 && !isHtmlTagState(state)));
@@ -97,7 +93,9 @@ abstract class BaseHtmlLexer extends DelegateLexer {
if (style || script) {
// encountered tag name in end of tag
if (seenTag) {
seenTag = false;
if (isHtmlTagState(state)) {
seenTag = false;
}
return;
}

2
xml/impl/src/com/intellij/lexer/XHtmlLexer.java
View File

@@ -28,6 +28,6 @@ public class XHtmlLexer extends HtmlLexer {
}
protected boolean isHtmlTagState(int state) {
return state == __XmlLexer.TAG;
return state == __XmlLexer.TAG || state == __XmlLexer.END_TAG;
}
}