restore local variable during inplace introduce (EA-33085 - NPE: IntroduceFieldDialog...

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 085d3e9d7cbcaa50ac94d28e483e230dfa677620..fe3dcfdfb65211c31545b0fdcc045410c176dc02 100644 (file)
--- a/platform/lang-impl/src/com/intellij/refactoring/introduce/inplace/AbstractInplaceIntroducer.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/introduce/inplace/AbstractInplaceIntroducer.java
@@ -63,7 +63,7 @@ import java.util.List;
  */
 public abstract class AbstractInplaceIntroducer<V extends PsiNameIdentifierOwner, E extends PsiElement> extends
                                                                                                         InplaceVariableIntroducer<E> {
-  protected final V myLocalVariable;
+  protected V myLocalVariable;
   protected RangeMarker myLocalMarker;
 
   protected final String myExprText;
@@ -433,6 +433,7 @@ public abstract class AbstractInplaceIntroducer<V extends PsiNameIdentifierOwner
 
           final V localVariable = getLocalVariable();
           if (localVariable != null && localVariable.isPhysical()) {
+            myLocalVariable = localVariable;
             final PsiElement nameIdentifier = localVariable.getNameIdentifier();
             if (nameIdentifier != null) {
               myLocalMarker = createMarker(nameIdentifier);