diff --git a/platform/lang-impl/src/com/intellij/formatting/InitialInfoBuilder.java b/platform/lang-impl/src/com/intellij/formatting/InitialInfoBuilder.java
index f259926413df..6804f0a900fb 100644
--- a/platform/lang-impl/src/com/intellij/formatting/InitialInfoBuilder.java
+++ b/platform/lang-impl/src/com/intellij/formatting/InitialInfoBuilder.java
@@ -162,8 +162,7 @@ public class InitialInfoBuilder {
 
     collectAlignments(rootBlock);
 
-    if (isInsideFormattingRanges(rootBlock, rootBlockIsRightBlock) 
-        || myCollectAlignmentsInsideFormattingRange && isInsideExtendedAffectedRange(rootBlock)) {
+    if (isInsideFormattingRanges(rootBlock, rootBlockIsRightBlock) || shouldCollectAlignmentsAround(rootBlock)) {
       final List<Block> subBlocks = rootBlock.getSubBlocks();
       if (subBlocks.isEmpty()) {
         final AbstractBlockWrapper wrapper = buildLeafBlock(rootBlock, parent, false, index, parentBlock);
@@ -179,6 +178,10 @@ public class InitialInfoBuilder {
     }
   }
 
+  private boolean shouldCollectAlignmentsAround(Block rootBlock) {
+    return myCollectAlignmentsInsideFormattingRange && isInsideExtendedAffectedRange(rootBlock);
+  }
+
   private void collectAlignments(Block rootBlock) {
     if (myCollectAlignmentsInsideFormattingRange && rootBlock.getAlignment() != null
         && isAffectedByFormatting(rootBlock) && !myInsideFormatRestrictingTag)