diff --git a/xml/xml-psi-impl/src/com/intellij/lexer/BaseHtmlLexer.java b/xml/xml-psi-impl/src/com/intellij/lexer/BaseHtmlLexer.java index e09bc2264fdc..aed3c551a2f6 100644 --- a/xml/xml-psi-impl/src/com/intellij/lexer/BaseHtmlLexer.java +++ b/xml/xml-psi-impl/src/com/intellij/lexer/BaseHtmlLexer.java @@ -154,13 +154,6 @@ abstract class BaseHtmlLexer extends DelegateLexer { } } } - - @Nullable - protected Language getScriptLanguage() { - Collection instancesByMimeType = Language.findInstancesByMimeType(scriptType != null ? scriptType.trim() : null); - return instancesByMimeType.isEmpty() ? null : instancesByMimeType.iterator().next(); - } - @Nullable protected IElementType getCurrentScriptElementType() { HtmlScriptContentProvider scriptContentProvider = findScriptContentProvider(scriptType); diff --git a/xml/xml-psi-impl/src/com/intellij/lexer/HtmlLexer.java b/xml/xml-psi-impl/src/com/intellij/lexer/HtmlLexer.java index 98858a387dff..dc0e4d3f6cfd 100644 --- a/xml/xml-psi-impl/src/com/intellij/lexer/HtmlLexer.java +++ b/xml/xml-psi-impl/src/com/intellij/lexer/HtmlLexer.java @@ -16,9 +16,7 @@ package com.intellij.lexer; import com.intellij.lang.HtmlInlineScriptTokenTypesProvider; -import com.intellij.lang.Language; import com.intellij.lang.LanguageHtmlInlineScriptTokenTypesProvider; -import com.intellij.lang.LanguageUtil; import com.intellij.openapi.extensions.Extensions; import com.intellij.psi.TokenType; import com.intellij.psi.tree.IElementType; @@ -76,9 +74,7 @@ public class HtmlLexer extends BaseHtmlLexer { tokenType = ourInlineStyleElementType; } } else if (hasSeenScript()) { - Language scriptLanguage = getScriptLanguage(); - boolean canInject = scriptLanguage == null || LanguageUtil.isInjectableLanguage(scriptLanguage); - if (hasSeenTag() && isStartOfEmbeddmentTagContent(tokenType) && canInject) { + if (hasSeenTag() && isStartOfEmbeddmentTagContent(tokenType)) { myTokenEnd = skipToTheEndOfTheEmbeddment(); IElementType currentScriptElementType = getCurrentScriptElementType(); tokenType = currentScriptElementType == null ? XmlTokenType.XML_DATA_CHARACTERS : currentScriptElementType;