From 4188ab657c94c5dead5449c0a1ce041c70a5871e Mon Sep 17 00:00:00 2001
From: anna <Anna.Kozlova@jetbrains.com>
Date: Thu, 16 Feb 2012 14:23:30 +0100
Subject: [PATCH] inplace introduce variable: qualify expression if necessary
 (IDEA-81430)

---
 .../JavaVariableInplaceIntroducer.java                | 11 +++++++++++
 1 file changed, 11 insertions(+)

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 3f257f307055..cd2bfe6acbaa 100644
--- a/java/java-impl/src/com/intellij/refactoring/introduceVariable/JavaVariableInplaceIntroducer.java
+++ b/java/java-impl/src/com/intellij/refactoring/introduceVariable/JavaVariableInplaceIntroducer.java
@@ -37,6 +37,8 @@ import com.intellij.psi.util.TypeConversionUtil;
 import com.intellij.refactoring.JavaRefactoringSettings;
 import com.intellij.refactoring.introduce.inplace.InplaceVariableIntroducer;
 import com.intellij.refactoring.introduceParameter.AbstractJavaInplaceIntroducer;
+import com.intellij.refactoring.rename.inplace.ResolveSnapshotProvider;
+import com.intellij.refactoring.rename.inplace.VariableInplaceRenamer;
 import com.intellij.refactoring.ui.TypeSelectorManagerImpl;
 import com.intellij.ui.NonFocusableCheckBox;
 import org.jetbrains.annotations.NotNull;
@@ -67,6 +69,8 @@ public class JavaVariableInplaceIntroducer extends InplaceVariableIntroducer<Psi
   protected final SmartTypePointer myDefaultType;
   protected final TypeExpression myExpression;
 
+  private ResolveSnapshotProvider.ResolveSnapshot myConflictResolver;
+
   public JavaVariableInplaceIntroducer(final Project project,
                                        final TypeExpression expression,
                                        final Editor editor,
@@ -93,6 +97,10 @@ public class JavaVariableInplaceIntroducer extends InplaceVariableIntroducer<Psi
                          rangeMarkers.toArray(new RangeMarker[rangeMarkers.size()]));
     }
     myExpression = expression;
+    if (declarationStatement != null) {
+      final ResolveSnapshotProvider resolveSnapshotProvider = VariableInplaceRenamer.INSTANCE.forLanguage(declarationStatement.getLanguage());
+      myConflictResolver = resolveSnapshotProvider != null ? resolveSnapshotProvider.createSnapshot(declarationStatement) : null;
+    }
     final PsiType defaultType = elementToRename.getType();
     myDefaultType = SmartTypePointerManager.getInstance(project).createSmartTypePointer(defaultType);
     setAdvertisementText(getAdvertisementText(declarationStatement, defaultType, hasTypeSuggestion));
@@ -146,6 +154,9 @@ public class JavaVariableInplaceIntroducer extends InplaceVariableIntroducer<Psi
           ApplicationManager.getApplication().runWriteAction(new Runnable() {
             public void run() {
               appendTypeCasts(getOccurrenceMarkers(), file, myProject, psiVariable);
+              if (myConflictResolver != null) {
+                myConflictResolver.apply(psiVariable.getName());
+              }
             }
           });
         }