From 2515a35447e26547efe2a6448c4b41ef8c96541b Mon Sep 17 00:00:00 2001
From: Yaroslav Lepenkin <yaroslav.lepenkin@jetbrains.com>
Date: Wed, 27 May 2015 13:10:01 +0300
Subject: [PATCH] Do not build additional blocks if we are not in "reformat
 context mode" (Fixes some tests, returns previous behaviour to regular
 reformat)

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

diff --git a/platform/lang-impl/src/com/intellij/formatting/InitialInfoBuilder.java b/platform/lang-impl/src/com/intellij/formatting/InitialInfoBuilder.java
index fa85cc607222..7db9f0e1ffa7 100644
--- a/platform/lang-impl/src/com/intellij/formatting/InitialInfoBuilder.java
+++ b/platform/lang-impl/src/com/intellij/formatting/InitialInfoBuilder.java
@@ -181,6 +181,9 @@ class InitialInfoBuilder {
       if (rootBlock instanceof ReadOnlyBlockInformationProvider) {
         myReadOnlyBlockInformationProvider = (ReadOnlyBlockInformationProvider)rootBlock;
       }
+      if (!isInsideFormattingRanges && !myCollectAlignmentsInsideFormattingRange) {
+        return processSimpleBlock(rootBlock, parent, true, index, parentBlock);
+      }
 
       final List<Block> subBlocks = rootBlock.getSubBlocks();
       if (subBlocks.isEmpty() || myReadOnlyBlockInformationProvider != null