MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-05-06 13:20:53 +07:00
Code Issues Packages Projects Releases Wiki Activity

WEB-8397 Incorrect "element is not allowed here" inspection

Browse Source 
script tag contains only character data according http://www.w3.org/TR/html-markup/script.html
This commit is contained in:
Fedor Korotkov
2013-09-08 20:53:25 +04:00
parent 12e32a8890
commit 482c517f0d
2 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
xml/xml-psi-impl/src/com/intellij/lexer/BaseHtmlLexer.java
View File

@@ -154,13 +154,6 @@ abstract class BaseHtmlLexer extends DelegateLexer {
}
}
}
@Nullable
protected Language getScriptLanguage() {
Collection<Language> instancesByMimeType = Language.findInstancesByMimeType(scriptType != null ? scriptType.trim() : null);
return instancesByMimeType.isEmpty() ? null : instancesByMimeType.iterator().next();
}
@Nullable
protected IElementType getCurrentScriptElementType() {
HtmlScriptContentProvider scriptContentProvider = findScriptContentProvider(scriptType);

6
xml/xml-psi-impl/src/com/intellij/lexer/HtmlLexer.java
View File

@@ -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;