diff --git a/xml/impl/resources/liveTemplates/zen_html.xml b/xml/impl/resources/liveTemplates/zen_html.xml index 8a1d9cf97811..88adf4199854 100644 --- a/xml/impl/resources/liveTemplates/zen_html.xml +++ b/xml/impl/resources/liveTemplates/zen_html.xml @@ -4,7 +4,6 @@ @@ -57,28 +51,24 @@ @@ -453,7 +404,6 @@ @@ -1663,7 +1484,6 @@ @@ -1761,7 +1574,6 @@ \ No newline at end of file diff --git a/xml/impl/src/com/intellij/codeInsight/template/HtmlTextContextType.java b/xml/impl/src/com/intellij/codeInsight/template/HtmlTextContextType.java index c16509e45d2f..c0c2c98279fd 100644 --- a/xml/impl/src/com/intellij/codeInsight/template/HtmlTextContextType.java +++ b/xml/impl/src/com/intellij/codeInsight/template/HtmlTextContextType.java @@ -16,10 +16,12 @@ package com.intellij.codeInsight.template; import com.intellij.codeInsight.CodeInsightBundle; +import com.intellij.lang.Language; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiErrorElement; import com.intellij.psi.PsiFile; import com.intellij.psi.util.PsiTreeUtil; +import com.intellij.psi.util.PsiUtilCore; import com.intellij.psi.xml.XmlComment; import com.intellij.psi.xml.XmlDocument; import com.intellij.psi.xml.XmlText; @@ -36,10 +38,11 @@ public class HtmlTextContextType extends TemplateContextType { @Override public boolean isInContext(@NotNull PsiFile file, int offset) { - if (!HtmlContextType.isMyLanguage(file.getLanguage())) { + Language language = PsiUtilCore.getLanguageAtOffset(file, offset); + if (!HtmlContextType.isMyLanguage(language)) { return false; } - PsiElement element = file.findElementAt(offset); + PsiElement element = file.getViewProvider().findElementAt(offset, language); return element == null || isInContext(element); }