inline parameter: reject inlining same final field on different objects

GitOrigin-RevId: d76451b71ff470adf6897c679dc6a83ecc241c72

java/java-impl/src/com/intellij/refactoring/inline/InlineParameterHandler.java

@@ -266,7 +266,10 @@ public class InlineParameterHandler extends JavaInlineActionHandler {
     final PsiField field1 = getReferencedFinalField(expr1);
     final PsiField field2 = getReferencedFinalField(expr2);
     if (field1 != null && field1 == field2) {
-      return true;
+      PsiExpression q1 = ((PsiReferenceExpression)expr1).getQualifierExpression();
+      PsiExpression q2 = ((PsiReferenceExpression)expr2).getQualifierExpression();
+      return q1 == null && q2 == null ||
+             q1 != null && q2 != null && PsiEquivalenceUtil.areElementsEquivalent(q1, q2);
     }
     Object value1 = JavaPsiFacade.getInstance(expr1.getProject()).getConstantEvaluationHelper().computeConstantExpression(expr1);
     Object value2 = JavaPsiFacade.getInstance(expr2.getProject()).getConstantEvaluationHelper().computeConstantExpression(expr2);

java/java-tests/testData/refactoring/inlineParameter/RefSameFinalFieldOtherObject.java

@@ -0,0 +1,13 @@
+public class Subject {
+  private int myInt;
+  private int t;
+
+  public void wp(int <caret>p) {
+    myInt += p;
+  }
+
+  void foo(Subject s) {
+      wp(s.t);
+      wp(t);
+  }
+}

java/java-tests/testSrc/com/intellij/java/refactoring/inline/InlineParameterTest.java

@@ -122,6 +122,10 @@ public class InlineParameterTest extends LightRefactoringTestCase {
     doTestCannotFindInitializer();
   }
 
+  public void testRefSameFinalFieldOtherObject() {
+    doTestCannotFindInitializer();
+  }
+
   public void testRef2ConstantsWithTheSameValue() {
     doTest(false);
   }