inplace introducer: another case to restore expression (IDEA-113352)

java/java-impl/src/com/intellij/refactoring/introduceParameter/AbstractJavaInplaceIntroducer.java

@@ -158,6 +158,9 @@ public abstract class AbstractJavaInplaceIntroducer extends AbstractInplaceIntro
       }
       if (parent instanceof PsiExpression) {
         expression = (PsiExpression)parent;
+        if (expression.getText().equals(exprText)) {
+          return expression;
+        }
       } else {
         return null;
       }

java/java-tests/testData/refactoring/inplaceIntroduceParameter/replaceAll3.java

@@ -0,0 +1,12 @@
+class C {
+    static enum E {
+        A
+    }
+
+    void x(String s1, String s2) {}
+
+    private void y() {
+        x(E.A.toString(), E.<caret>A.toString());
+
+    }
+}

java/java-tests/testData/refactoring/inplaceIntroduceParameter/replaceAll3_after.java

@@ -0,0 +1,12 @@
+class C {
+    static enum E {
+        A
+    }
+
+    void x(String s1, String s2) {}
+
+    private void y(E a) {
+        x(a.toString(), a.toString());
+
+    }
+}

java/java-tests/testSrc/com/intellij/refactoring/InplaceIntroduceParameterTest.java

@@ -59,6 +59,15 @@ public class InplaceIntroduceParameterTest extends AbstractJavaInplaceIntroduceT
     });
   }
 
+  public void testReplaceAll3() throws Exception {
+    doTest(new Pass<AbstractInplaceIntroducer>() {
+      @Override
+      public void pass(AbstractInplaceIntroducer inplaceIntroduceFieldPopup) {
+        inplaceIntroduceFieldPopup.setReplaceAllOccurrences(true);
+      }
+    });
+  }
+
   public void testReplaceAllMethodCalls() throws Exception {
     doTest(new Pass<AbstractInplaceIntroducer>() {
       @Override