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] 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();
         }