From: Rustam.Vishnyakov <rustam.vishnyakov@gmail.com>
Date: Wed, 15 Sep 2010 17:02:22 +0000 (+0400)
Subject: Fix broken formatting functionality due to PHP parsing changes, part 10 (PHP templates)
X-Git-Tag: idea/96.1190~3
X-Git-Url: https://git.jetbrains.org/?p=idea%2Fcommunity.git;a=commitdiff_plain;h=2b49548c0e41ebc79b8c36a4e96ccbeea45a37dd

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 04c6eb408f6c..f876f44ae5ac 100644
--- 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 c3f43d374928..4093a244e147 100644
--- 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;