From 7f34d2b6f38874c95c0ace0c65f9f9546be5018c Mon Sep 17 00:00:00 2001
From: anna <Anna.Kozlova@jetbrains.com>
Date: Wed, 8 Feb 2012 13:13:23 +0100
Subject: [PATCH] introduce variable: reassign to existing one: reuse old name
 in everywhere

---
 .../introduceVariable/JavaVariableInplaceIntroducer.java     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/java/java-impl/src/com/intellij/refactoring/introduceVariable/JavaVariableInplaceIntroducer.java b/java/java-impl/src/com/intellij/refactoring/introduceVariable/JavaVariableInplaceIntroducer.java
index 0ff43fa7f042..400611d56e47 100644
--- a/java/java-impl/src/com/intellij/refactoring/introduceVariable/JavaVariableInplaceIntroducer.java
+++ b/java/java-impl/src/com/intellij/refactoring/introduceVariable/JavaVariableInplaceIntroducer.java
@@ -45,6 +45,7 @@ import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -85,8 +86,10 @@ public class JavaVariableInplaceIntroducer extends InplaceVariableIntroducer<Psi
     myPointer = declarationStatement != null ? SmartPointerManager.getInstance(project).createSmartPsiElementPointer(declarationStatement) : null;
     editor.putUserData(ReassignVariableUtil.DECLARATION_KEY, myPointer);
     if (occurrenceMarkers != null) {
+      final ArrayList<RangeMarker> rangeMarkers = new ArrayList<RangeMarker>(occurrenceMarkers);
+      rangeMarkers.add(exprMarker);
       editor.putUserData(ReassignVariableUtil.OCCURRENCES_KEY,
-                         occurrenceMarkers.toArray(new RangeMarker[occurrenceMarkers.size()]));
+                         rangeMarkers.toArray(new RangeMarker[rangeMarkers.size()]));
     }
     myExpression = expression;
     final PsiType defaultType = elementToRename.getType();