From 4304a317a65f09f8e85e934f2fadbe02422cb68e Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Fri, 18 Mar 2016 08:32:47 +0100
Subject: [PATCH 1/2] wrap only in-place introduce into a write action

---
 .../introduce/inplace/AbstractInplaceIntroducer.java          | 4 ++--
 .../refactoring/rename/inplace/InplaceRefactoring.java        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/refactoring/introduce/inplace/AbstractInplaceIntroducer.java b/platform/lang-impl/src/com/intellij/refactoring/introduce/inplace/AbstractInplaceIntroducer.java
index af66d0ad2b82..be077e257346 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/introduce/inplace/AbstractInplaceIntroducer.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/introduce/inplace/AbstractInplaceIntroducer.java
@@ -530,7 +530,7 @@ public abstract class AbstractInplaceIntroducer<V extends PsiNameIdentifierOwner
   @Override
   protected boolean performRefactoring() {
     if (!ensureValid()) return false;
-    CommandProcessor.getInstance().executeCommand(myProject, new Runnable() {
+    WriteCommandAction.runWriteCommandAction(myProject, getCommandName(), getCommandName(), new Runnable() {
       @Override
       public void run() {
         final String refactoringId = getRefactoringId();
@@ -551,7 +551,7 @@ public abstract class AbstractInplaceIntroducer<V extends PsiNameIdentifierOwner
         }
         performIntroduce();
       }
-    }, getCommandName(), getCommandName());
+    });
 
     V variable = getVariable();
     if (variable != null) {
diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/InplaceRefactoring.java b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/InplaceRefactoring.java
index c299c3ba1cbc..ff979a3be69c 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/InplaceRefactoring.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/InplaceRefactoring.java
@@ -871,7 +871,7 @@ public abstract class InplaceRefactoring {
       boolean bind = false;
       try {
         if (!brokenOff) {
-          bind = ApplicationManager.getApplication().runWriteAction((Computable<Boolean>)InplaceRefactoring.this::performRefactoring);
+          bind = performRefactoring();
         } else {
           performCleanup();
         }

From e87a9fb7dcf32dd06ef7ef53828093acae93c2db Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Fri, 18 Mar 2016 08:52:58 +0100
Subject: [PATCH 2/2] don't save all documents after every command involving
 file system changes under VCS: seems to be not needed

---
 .../src/com/intellij/openapi/vcs/VcsVFSListener.java     | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/VcsVFSListener.java b/platform/vcs-api/src/com/intellij/openapi/vcs/VcsVFSListener.java
index 4ee2d8c3df6e..daae2529369f 100644
--- a/platform/vcs-api/src/com/intellij/openapi/vcs/VcsVFSListener.java
+++ b/platform/vcs-api/src/com/intellij/openapi/vcs/VcsVFSListener.java
@@ -490,15 +490,6 @@ public abstract class VcsVFSListener implements Disposable {
       if (myCommandLevel == 0) {
         if (!myAddedFiles.isEmpty() || !myDeletedFiles.isEmpty() || !myDeletedWithoutConfirmFiles.isEmpty() || !myMovedFiles.isEmpty() ||
             ! myDirtyFiles.isEmpty()) {
-          // avoid reentering commandFinished handler - saving the documents may cause a "before file deletion" event firing,
-          // which will cause closing the text editor, which will itself run a command that will be caught by this listener
-          myCommandLevel++;
-          try {
-            FileDocumentManager.getInstance().saveAllDocuments();
-          }
-          finally {
-            myCommandLevel--;
-          }
           doNotDeleteAddedCopiedOrMovedFiles();
           checkMovedAddedSourceBack();
           if (!myAddedFiles.isEmpty()) {