From 24d322abcd561f0253903d5caf3b1f3060756cbd Mon Sep 17 00:00:00 2001
From: Rustam Vishnyakov <rustam.vishnyakov@jetbrains.com>
Date: Tue, 3 Nov 2015 16:53:17 +0300
Subject: [PATCH] A fix for WI-28533 Code reformat does not reformat PHP when
 the file is named pi.json.php

---
 json/json.iml                                       | 1 +
 json/src/com/intellij/json/formatter/JsonBlock.java | 6 ++++++
 2 files changed, 7 insertions(+)

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 @@
     <orderEntry type="module" module-name="xml-openapi" />
     <orderEntry type="module" module-name="spellchecker" />
     <orderEntry type="library" name="Guava" level="project" />
+    <orderEntry type="module" module-name="webide-impl" />
   </component>
 </module>
\ 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);
   }