diff --git a/json/json.iml b/json/json.iml
index 558f2e07197d..50da5f8781aa 100644
--- a/json/json.iml
+++ b/json/json.iml
@@ -15,5 +15,6 @@
+
\ No newline at end of file
diff --git a/json/src/com/intellij/json/formatter/JsonBlock.java b/json/src/com/intellij/json/formatter/JsonBlock.java
index 0f12cce18790..9bf31bb323bc 100644
--- a/json/src/com/intellij/json/formatter/JsonBlock.java
+++ b/json/src/com/intellij/json/formatter/JsonBlock.java
@@ -13,9 +13,11 @@ import com.intellij.psi.PsiFile;
import com.intellij.psi.TokenType;
import com.intellij.psi.codeStyle.CodeStyleSettings;
import com.intellij.psi.codeStyle.CommonCodeStyleSettings;
+import com.intellij.psi.templateLanguages.OuterLanguageElement;
import com.intellij.psi.tree.TokenSet;
import com.intellij.util.Function;
import com.intellij.util.containers.ContainerUtil;
+import com.intellij.webcore.template.formatter.TemplateFormatUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -142,6 +144,10 @@ public class JsonBlock implements ASTBlock {
}
}
}
+ if (childNode.getPsi() instanceof OuterLanguageElement) {
+ Block templateBlock = TemplateFormatUtil.buildTemplateLanguageBlock((OuterLanguageElement)childNode.getPsi(), mySettings, indent);
+ if (templateBlock != null) return templateBlock;
+ }
return new JsonBlock(this, childNode, mySettings, alignment, indent, wrap);
}