diff --git a/platform/lang-impl/src/com/intellij/psi/codeStyle/autodetect/FormatterBasedLineIndentInfoBuilder.java b/platform/lang-impl/src/com/intellij/psi/codeStyle/autodetect/FormatterBasedLineIndentInfoBuilder.java
index f8fe2aa972cf..164956c51e4a 100644
--- a/platform/lang-impl/src/com/intellij/psi/codeStyle/autodetect/FormatterBasedLineIndentInfoBuilder.java
+++ b/platform/lang-impl/src/com/intellij/psi/codeStyle/autodetect/FormatterBasedLineIndentInfoBuilder.java
@@ -77,7 +77,6 @@ public class FormatterBasedLineIndentInfoBuilder {
 
   @NotNull
   private List<Block> getBlocksStartingNewLine() {
-    PsiDocumentManager.getInstance(myFile.getProject()).commitDocument(myDocument);
     FormattingModel model = myFormattingModelBuilder.createModel(myFile, mySettings);
     Block root = model.getRootBlock();
     NewLineBlocksIterator newLineBlocksIterator = new NewLineBlocksIterator(root, myDocument);
diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java
index ce89a60e121d..380bf2c2233d 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java
@@ -815,7 +815,12 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi
 
   private void reinitDocumentIndentOptions() {
     if (myProject != null && !myProject.isDisposed()) {
-      CodeStyleSettingsManager.updateDocumentIndentOptions(myProject, myDocument);
+      PsiDocumentManager.getInstance(myProject).performForCommittedDocument(myDocument, new Runnable() {
+        @Override
+        public void run() {
+          CodeStyleSettingsManager.updateDocumentIndentOptions(myProject, myDocument);
+        }
+      });
     }
   }