diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleManagerImpl.java b/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleManagerImpl.java index 86b0ab89734e..79e537934960 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleManagerImpl.java @@ -793,6 +793,10 @@ public class CodeStyleManagerImpl extends CodeStyleManager implements Formatting if (myCaretModel.getVisualPosition().column == myVisualColumnToRestore) { return; } + Project project = myEditor.getProject(); + if (project == null || PsiDocumentManager.getInstance(project).isDocumentBlockedByPsi(myDocument)) { + return; + } insertWhiteSpaceIndentIfNeeded(newCaretLineStartOffset); }