From 1431f5a8f2fb409a0516f29c2c3cda55a571ae35 Mon Sep 17 00:00:00 2001
From: anna <anna.kozlova@jetbrains.com>
Date: Fri, 24 Jun 2011 19:04:00 +0400
Subject: [PATCH] inplace introduce: restore local variable before actual
 refactoring

---
 .../inplace/AbstractInplaceIntroducer.java        | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 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 07dc063c4d31..488ee578a001 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
@@ -19,7 +19,9 @@ import com.intellij.codeInsight.highlighting.HighlightManager;
 import com.intellij.codeInsight.template.impl.TemplateManagerImpl;
 import com.intellij.codeInsight.template.impl.TemplateState;
 import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.application.Result;
 import com.intellij.openapi.command.CommandProcessor;
+import com.intellij.openapi.command.WriteCommandAction;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.RangeMarker;
 import com.intellij.openapi.editor.ScrollType;
@@ -186,10 +188,11 @@ public abstract class AbstractInplaceIntroducer<V extends PsiNameIdentifierOwner
 
   @Override
   protected void addReferenceAtCaret(Collection<PsiReference> refs) {
-    final V variable = getVariable();
+    super.addReferenceAtCaret(refs);
+    final V variable = getLocalVariable();
     if (variable != null) {
       for (PsiReference reference : ReferencesSearch.search(variable)) {
-        refs.remove(reference);
+        refs.add(reference);
       }
     }
   }
@@ -292,6 +295,14 @@ public abstract class AbstractInplaceIntroducer<V extends PsiNameIdentifierOwner
         super.moveOffsetAfter(false);
         return;
       }
+      if (getLocalVariable() != null) {
+        new WriteCommandAction(myProject, getCommandName(), getCommandName()) {
+          @Override
+          protected void run(Result result) throws Throwable {
+            getLocalVariable().setName(myLocalName);
+          }
+        }.execute();
+      }
       performIntroduce();
       saveSettings(getVariable());
     }