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

don't skip style/script content when there's no token type to parse them as corresponding language

Browse Source 
#IDEA-141736 fixed
This commit is contained in:
Dennis Ushakov
2016-03-25 14:45:54 +03:00
parent 621f97bf8b
commit 1f4f97398e
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xml/xml-psi-impl/src/com/intellij/lexer/HtmlLexer.java
+8 -6
View File
@@ -74,10 +74,11 @@ public class HtmlLexer extends BaseHtmlLexer {
if (hasSeenStyle()) {
if (hasSeenTag() && isStartOfEmbeddmentTagContent(tokenType)) {
Language stylesheetLanguage = getStyleLanguage();
if (stylesheetLanguage == null || LanguageUtil.isInjectableLanguage(stylesheetLanguage)) {
IElementType currentStylesheetElementType;
if ((stylesheetLanguage == null || LanguageUtil.isInjectableLanguage(stylesheetLanguage)) &&
(currentStylesheetElementType = getCurrentStylesheetElementType()) != null) {
myTokenEnd = skipToTheEndOfTheEmbeddment();
IElementType currentStylesheetElementType = getCurrentStylesheetElementType();
tokenType = currentStylesheetElementType == null ? XmlTokenType.XML_DATA_CHARACTERS : currentStylesheetElementType;
tokenType = currentStylesheetElementType;
}
} else if (ourInlineStyleElementType!=null && isStartOfEmbeddmentAttributeValue(tokenType) && hasSeenAttribute()) {
tokenType = ourInlineStyleElementType;
@@ -85,10 +86,11 @@ public class HtmlLexer extends BaseHtmlLexer {
} else if (hasSeenScript()) {
if (hasSeenTag() && isStartOfEmbeddmentTagContent(tokenType)) {
Language scriptLanguage = getScriptLanguage();
if (scriptLanguage == null || LanguageUtil.isInjectableLanguage(scriptLanguage)) {
IElementType currentScriptElementType;
if ((scriptLanguage == null || LanguageUtil.isInjectableLanguage(scriptLanguage)) &&
(currentScriptElementType = getCurrentScriptElementType()) != null) {
myTokenEnd = skipToTheEndOfTheEmbeddment();
IElementType currentScriptElementType = getCurrentScriptElementType();
tokenType = currentScriptElementType == null ? XmlTokenType.XML_DATA_CHARACTERS : currentScriptElementType;
tokenType = currentScriptElementType;
}
} else if (hasSeenAttribute() && isStartOfEmbeddmentAttributeValue(tokenType) && ourInlineScriptElementType!=null) {
myTokenEnd = skipToTheEndOfTheEmbeddment();