From 948ebcc12e5accc0f6b0b3f49511ef6aa9c45e46 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Mon, 16 Mar 2020 10:39:43 +0100
Subject: [PATCH] inline parameter: allow inlining with different call sites

GitOrigin-RevId: 4d580bcd0f80076921111eae235f167fa98058f5
---
 .../intellij/refactoring/inline/InlineParameterHandler.java | 4 +---
 .../refactoring/inlineParameter/RefSameNonFinalField.java   | 6 +++---
 .../inlineParameter/RefSameNonFinalField.java.after         | 6 +++---
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/java/java-impl/src/com/intellij/refactoring/inline/InlineParameterHandler.java b/java/java-impl/src/com/intellij/refactoring/inline/InlineParameterHandler.java
index 192f63697b90..42a3ab432ea6 100644
--- a/java/java-impl/src/com/intellij/refactoring/inline/InlineParameterHandler.java
+++ b/java/java-impl/src/com/intellij/refactoring/inline/InlineParameterHandler.java
@@ -99,9 +99,7 @@ public class InlineParameterHandler extends JavaInlineActionHandler {
           if (expressions.length <= index) return false;
           PsiExpression argument = expressions[index];
           if (!refInitializer.isNull()) {
-            return argument != null
-                   && PsiEquivalenceUtil.areElementsEquivalent(refInitializer.get(), argument)
-                   && PsiEquivalenceUtil.areElementsEquivalent(refMethodCall.get(), methodCall);
+            return argument != null && PsiEquivalenceUtil.areElementsEquivalent(refInitializer.get(), argument);
           }
           if (InlineToAnonymousConstructorProcessor.isConstant(argument) || getReferencedFinalField(argument) != null) {
             if (refConstantInitializer.isNull()) {
diff --git a/java/java-tests/testData/refactoring/inlineParameter/RefSameNonFinalField.java b/java/java-tests/testData/refactoring/inlineParameter/RefSameNonFinalField.java
index 6a8a8a13c844..7a4bf60d749c 100644
--- a/java/java-tests/testData/refactoring/inlineParameter/RefSameNonFinalField.java
+++ b/java/java-tests/testData/refactoring/inlineParameter/RefSameNonFinalField.java
@@ -2,12 +2,12 @@ public class Subject {
   private int myInt;
   private int t;
 
-  public void wp(int <caret>p) {
+  public void wp(String s, int <caret>p) {
     myInt += p;
   }
 
   void foo() {
-      wp(t);
-      wp(t);
+      wp("s1", t);
+      wp("s2", t);
   }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/refactoring/inlineParameter/RefSameNonFinalField.java.after b/java/java-tests/testData/refactoring/inlineParameter/RefSameNonFinalField.java.after
index 55b393e125ce..57385ae7532f 100644
--- a/java/java-tests/testData/refactoring/inlineParameter/RefSameNonFinalField.java.after
+++ b/java/java-tests/testData/refactoring/inlineParameter/RefSameNonFinalField.java.after
@@ -2,12 +2,12 @@ public class Subject {
   private int myInt;
   private int t;
 
-  public void wp() {
+  public void wp(String s) {
     myInt += t;
   }
 
   void foo() {
-      wp();
-      wp();
+      wp("s1");
+      wp("s2");
   }
 }
\ No newline at end of file