From c83263a3515dce3ac706bc86754f0036f8af2729 Mon Sep 17 00:00:00 2001 From: Eugene Kudelevsky Date: Fri, 11 Mar 2011 19:33:15 +0300 Subject: [PATCH] jsp outer elements can be under XmlText --- .../daemon/impl/analysis/XmlHighlightVisitor.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlHighlightVisitor.java b/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlHighlightVisitor.java index 322524dc962b..f05231089ca5 100644 --- a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlHighlightVisitor.java +++ b/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlHighlightVisitor.java @@ -73,6 +73,18 @@ public class XmlHighlightVisitor extends XmlElementVisitor implements HighlightV @Override protected Boolean compute(PsiElement parent, Object p) { OuterLanguageElement element = PsiTreeUtil.getChildOfType(parent, OuterLanguageElement.class); + + if (element == null) { + // JspOuterLanguageElement is located under XmlText + for (PsiElement child = parent.getFirstChild(); child != null; child = child.getNextSibling()) { + if (child instanceof XmlText) { + element = PsiTreeUtil.getChildOfType(child, OuterLanguageElement.class); + if (element != null) { + break; + } + } + } + } if (element == null) return false; PsiFile containingFile = parent.getContainingFile(); return containingFile.getViewProvider().getBaseLanguage() != containingFile.getLanguage();