Fix broken formatting functionality due to PHP parsing changes, part 10 (PHP templates)

diff --git a/platform/lang-impl/src/com/intellij/formatting/BlockDebugUtil.java b/platform/lang-impl/src/com/intellij/formatting/BlockDebugUtil.java
index 04c6eb408f6c9ad530f226db583f0e9e6cc942da..f876f44ae5ac9b826a2bcca207e8c5b76782c905 100644 (file)
--- a/platform/lang-impl/src/com/intellij/formatting/BlockDebugUtil.java
+++ b/platform/lang-impl/src/com/intellij/formatting/BlockDebugUtil.java
@@ -57,6 +57,10 @@ public class BlockDebugUtil {
     else {
       out.print(" <Indent: -- null -->");
     }
+    Alignment alignment = block.getAlignment();
+    if (alignment != null) {
+      out.print(" <Alignment: " + Integer.toHexString(alignment.hashCode()).substring(0,4) + "...>");
+    }
     out.print(" " + block.getTextRange() + " ");
     if (block instanceof ASTBlock) {
       ASTNode node = ((ASTBlock)block).getNode();

diff --git a/platform/lang-impl/src/com/intellij/formatting/templateLanguages/TemplateLanguageBlock.java b/platform/lang-impl/src/com/intellij/formatting/templateLanguages/TemplateLanguageBlock.java
index c3f43d374928e26a8d40908a6d6a8e2cc40eac93..4093a244e147a7eaa8ad25f1f086a3e91e14ec80 100644 (file)
--- a/platform/lang-impl/src/com/intellij/formatting/templateLanguages/TemplateLanguageBlock.java
+++ b/platform/lang-impl/src/com/intellij/formatting/templateLanguages/TemplateLanguageBlock.java
@@ -36,7 +36,7 @@ import java.util.List;
 public abstract class TemplateLanguageBlock extends AbstractBlock implements BlockWithParent {
   private final TemplateLanguageBlockFactory myBlockFactory;
   private final CodeStyleSettings mySettings;
-  private List<DataLanguageBlockWrapper> myForeignChildren;
+  protected List<DataLanguageBlockWrapper> myForeignChildren;
   private boolean myChildrenBuilt = false;
   private BlockWithParent myParent;