From ae31fc2f2706622343a7202fdf6f7f02458ef102 Mon Sep 17 00:00:00 2001 From: Rustam Vishnyakov Date: Mon, 10 Sep 2012 12:03:22 +0400 Subject: [PATCH] Correctly derive the language from root file type (a case of XML/HTML elements mix) --- .../formatting/templateLanguages/DataLanguageBlockWrapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/lang-impl/src/com/intellij/formatting/templateLanguages/DataLanguageBlockWrapper.java b/platform/lang-impl/src/com/intellij/formatting/templateLanguages/DataLanguageBlockWrapper.java index a810d1c9b238..26efa42a20cf 100644 --- a/platform/lang-impl/src/com/intellij/formatting/templateLanguages/DataLanguageBlockWrapper.java +++ b/platform/lang-impl/src/com/intellij/formatting/templateLanguages/DataLanguageBlockWrapper.java @@ -53,7 +53,7 @@ public class DataLanguageBlockWrapper implements ASTBlock, BlockEx, BlockWithPar if (node != null) { final PsiElement psi = node.getPsi(); if (psi != null) { - language = psi.getLanguage(); + language = psi.getContainingFile().getLanguage(); } } myLanguage = language;