From 2f34ff976ea88f7165100c2574b458507bfe8d28 Mon Sep 17 00:00:00 2001
From: anna <anna.kozlova@jetbrains.com>
Date: Wed, 29 Jun 2011 18:51:49 +0400
Subject: [PATCH] inplace introduce: restore initial local variable name

---
 .../escapePositionOnLocal.java                  |  2 +-
 .../escapePositionOnLocal_after.java            |  2 +-
 .../inplace/AbstractInplaceIntroducer.java      | 17 +++++++++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/java/java-tests/testData/refactoring/inplaceIntroduceConstant/escapePositionOnLocal.java b/java/java-tests/testData/refactoring/inplaceIntroduceConstant/escapePositionOnLocal.java
index 3e347d4c8622..b4f03ac0c1d7 100644
--- a/java/java-tests/testData/refactoring/inplaceIntroduceConstant/escapePositionOnLocal.java
+++ b/java/java-tests/testData/refactoring/inplaceIntroduceConstant/escapePositionOnLocal.java
@@ -15,6 +15,6 @@
  */
 class Test {
     void simpleMethod() {
-        boolean B<caret>B = false;
+        boolean b<caret>b = false;
     }
 }
diff --git a/java/java-tests/testData/refactoring/inplaceIntroduceConstant/escapePositionOnLocal_after.java b/java/java-tests/testData/refactoring/inplaceIntroduceConstant/escapePositionOnLocal_after.java
index a0ab8f9c339a..8f7a98d86213 100644
--- a/java/java-tests/testData/refactoring/inplaceIntroduceConstant/escapePositionOnLocal_after.java
+++ b/java/java-tests/testData/refactoring/inplaceIntroduceConstant/escapePositionOnLocal_after.java
@@ -16,6 +16,6 @@
 class Test {
 
     void simpleMethod() {
-        boolean <caret>BB = false;
+        boolean <caret>bb = false;
     }
 }
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 76f99b5a8949..130a88707135 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
@@ -333,6 +333,23 @@ public abstract class AbstractInplaceIntroducer<V extends PsiNameIdentifierOwner
             myExprMarker = myEditor.getDocument().createRangeMarker(myExpr.getTextRange());
           }
         }
+        if (myLocalMarker != null) {
+          final PsiElement refVariableElement = containingFile.findElementAt(myLocalMarker.getStartOffset());
+          if (refVariableElement != null) {
+            final PsiElement parent = refVariableElement.getParent();
+            if (parent instanceof PsiNamedElement) {
+              ((PsiNamedElement)parent).setName(myLocalName);
+            }
+          }
+
+          final V localVariable = getLocalVariable();
+          if (localVariable != null && localVariable.isPhysical()) {
+            final PsiElement nameIdentifier = localVariable.getNameIdentifier();
+            if (nameIdentifier != null) {
+              myLocalMarker = myEditor.getDocument().createRangeMarker(nameIdentifier.getTextRange());
+            }
+          }
+        }
         final List<RangeMarker> occurrenceMarkers = getOccurrenceMarkers();
         for (int i = 0, occurrenceMarkersSize = occurrenceMarkers.size(); i < occurrenceMarkersSize; i++) {
           RangeMarker marker = occurrenceMarkers.get(i);