From 0ecd7ca047fee89c1c5d6c47b8aff5d511aac620 Mon Sep 17 00:00:00 2001 From: Dennis Ushakov Date: Thu, 12 Jan 2017 21:13:59 +0300 Subject: [PATCH] customisable end of embeddment --- .../src/com/intellij/lexer/BaseHtmlLexer.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) 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 e7a6da5b81c3..a0ec491c2a9b 100644 --- a/xml/xml-psi-impl/src/com/intellij/lexer/BaseHtmlLexer.java +++ b/xml/xml-psi-impl/src/com/intellij/lexer/BaseHtmlLexer.java @@ -366,9 +366,7 @@ public abstract class BaseHtmlLexer extends DelegateLexer { String name = TreeUtil.getTokenText(base); if (caseInsensitive) name = name.toLowerCase(); - if((hasSeenScript() && XmlNameHandler.TOKEN_SCRIPT.equals(name)) || - (hasSeenStyle() && XmlNameHandler.TOKEN_STYLE.equals(name)) || - CompletionUtilCore.DUMMY_IDENTIFIER_TRIMMED.equalsIgnoreCase(name)) { + if(endOfTheEmbeddment(name)) { break; // really found end } } @@ -394,6 +392,12 @@ public abstract class BaseHtmlLexer extends DelegateLexer { return tokenEnd; } + protected boolean endOfTheEmbeddment(String name) { + return (hasSeenScript() && XmlNameHandler.TOKEN_SCRIPT.equals(name)) || + (hasSeenStyle() && XmlNameHandler.TOKEN_STYLE.equals(name)) || + CompletionUtilCore.DUMMY_IDENTIFIER_TRIMMED.equalsIgnoreCase(name); + } + protected boolean isValidAttributeValueTokenType(final IElementType tokenType) { return tokenType == XmlTokenType.XML_ATTRIBUTE_VALUE_TOKEN || tokenType == XmlTokenType.XML_ENTITY_REF_TOKEN ||