From f5580aaff79fbb81fd952c56e4c523ce203f1e87 Mon Sep 17 00:00:00 2001
From: Denis Zhdanov <Denis.Zhdanov@jetbrains.com>
Date: Mon, 20 Jun 2011 15:47:35 +0400
Subject: [PATCH] Corrected 'adjust line indent' processing in situations when
 target line indent is alignment-dependent

---
 .../com/intellij/formatting/InitialInfoBuilder.java    | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/formatting/InitialInfoBuilder.java b/platform/lang-impl/src/com/intellij/formatting/InitialInfoBuilder.java
index 04e01043456a..086dce257b69 100644
--- a/platform/lang-impl/src/com/intellij/formatting/InitialInfoBuilder.java
+++ b/platform/lang-impl/src/com/intellij/formatting/InitialInfoBuilder.java
@@ -120,9 +120,9 @@ class InitialInfoBuilder {
    */
   private AbstractBlockWrapper buildFrom(final Block rootBlock,
                                          final int index,
-                                         final CompositeBlockWrapper parent,
-                                         WrapImpl currentWrapParent,
-                                         final Block parentBlock,
+                                         @Nullable final CompositeBlockWrapper parent,
+                                         @Nullable WrapImpl currentWrapParent,
+                                         @Nullable final Block parentBlock,
                                          boolean rootBlockIsRightBlock
   ) {
     final WrapImpl wrap = (WrapImpl)rootBlock.getWrap();
@@ -325,10 +325,6 @@ class InitialInfoBuilder {
       return false;
     }
 
-    if (!block.isIncomplete()) {
-      return true;
-    }
-    
     // There is a possible case that particular sub-block has an alignment and we don't want to loose information about it by
     // excluding that sub-block from the processing.
     List<Block> blocks = block.getSubBlocks();