From aa18ce31612dd86096181266fa6107f7e4e1b061 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Mon, 9 Feb 2015 15:47:48 +0100
Subject: [PATCH] extract local variable: notifications restored

---
 .../JavaVariableInplaceIntroducer.java            | 14 ++++++++++++++
 .../inplace/AbstractInplaceIntroducer.java        | 15 ++++++++++++++-
 2 files changed, 28 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 d68e683de6ce..1ca65253307b 100644
--- a/java/java-impl/src/com/intellij/refactoring/introduceVariable/JavaVariableInplaceIntroducer.java
+++ b/java/java-impl/src/com/intellij/refactoring/introduceVariable/JavaVariableInplaceIntroducer.java
@@ -128,6 +128,11 @@ public class JavaVariableInplaceIntroducer extends AbstractJavaInplaceIntroducer
     return "IntroduceVariable";
   }
 
+  @Override
+  protected String getRefactoringId() {
+    return "refactoring.extractLocal";
+  }
+
   @Override
   protected void restoreState(@NotNull PsiVariable psiField) {
     if (myDeleteSelf) return;
@@ -159,6 +164,15 @@ public class JavaVariableInplaceIntroducer extends AbstractJavaInplaceIntroducer
     }
   }
 
+  @Override
+  protected PsiExpression getBeforeExpr() {
+    final PsiVariable variable = getVariable();
+    if (variable != null) {
+      return variable.getInitializer();
+    }
+    return super.getBeforeExpr();
+  }
+
   @Override
   protected void performIntroduce() {
     final PsiVariable psiVariable = getVariable();
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 ea0b8bad56e0..b0b6f8da971a 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
@@ -531,7 +531,16 @@ public abstract class AbstractInplaceIntroducer<V extends PsiNameIdentifierOwner
         final String refactoringId = getRefactoringId();
         if (refactoringId != null) {
           final RefactoringEventData beforeData = new RefactoringEventData();
-          beforeData.addElements(new PsiElement[] {getLocalVariable(), getExpr()});
+          final V localVariable = getLocalVariable();
+          if (localVariable != null) {
+            beforeData.addElement(localVariable);
+          } 
+          else {
+            final E beforeExpr = getBeforeExpr();
+            if (beforeExpr != null) {
+              beforeData.addElement(beforeExpr);
+            }
+          }
           myProject.getMessageBus()
             .syncPublisher(RefactoringEventListener.REFACTORING_EVENT_TOPIC).refactoringStarted(refactoringId, beforeData);
         }
@@ -546,6 +555,10 @@ public abstract class AbstractInplaceIntroducer<V extends PsiNameIdentifierOwner
     return false;
   }
 
+  protected E getBeforeExpr() {
+    return getExpr();
+  }
+
   protected boolean ensureValid() {
     final String newName = getInputName();
     if (getLocalVariable() == null && myExpr == null ||