MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

A fix for WI-28533 Code reformat does not reformat PHP when the file is named pi.json.php

Browse Source
This commit is contained in:
Rustam Vishnyakov
2015-11-03 17:12:38 +03:00
parent 7db292ea8d
commit 24d322abcd
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
json/json.iml
+1
View File
@@ -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>
json/src/com/intellij/json/formatter/JsonBlock.java
+6
View File
@@ -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);
}