Java: need to check if resolve is valid, otherwise there is no conflict (IJ-CR-138369)

GitOrigin-RevId: 2f895cdc66ded3ec8fb4c59843c1969e95f1c2d1

java/java-impl-refactorings/src/com/intellij/refactoring/convertToInstanceMethod/ConvertToInstanceMethodProcessor.java

@@ -396,8 +396,8 @@ public final class ConvertToInstanceMethodProcessor extends BaseRefactoringProce
       final PsiExpression qualifier = copy.getMethodExpression().getQualifierExpression();
       if (qualifier != null) {
         qualifier.delete();
-        PsiMethod method = copy.resolveMethod();
-        if (methodCall.resolveMethod() == method || method == null) {
+        JavaResolveResult resolveResult = copy.resolveMethodGenerics();
+        if (methodCall.resolveMethod() == resolveResult.getElement() || !resolveResult.isValidResult()) {
           return null;
         }
         return createQualifiedThisExpression();

java/java-tests/testData/refactoring/convertToInstance8Method/NoConflictingMembers2.java

@@ -0,0 +1,10 @@
+class Test {
+  int i;
+  void run(int i) {}
+}
+class Other {
+  static void <caret>run(Test test) {
+    System.out.println(test.i);
+    test.run(test.i);
+  }
+}

java/java-tests/testData/refactoring/convertToInstance8Method/NoConflictingMembers2.java.after

@@ -0,0 +1,12 @@
+class Test {
+  int i;
+
+    void run() {
+    System.out.println(i);
+    run(i);
+  }
+
+    void run(int i) {}
+}
+class Other {
+}

java/java-tests/testSrc/com/intellij/java/refactoring/convertToInstanceMethod/ConvertToInstance8MethodTest.java

@@ -13,6 +13,7 @@ public class ConvertToInstance8MethodTest extends ConvertToInstanceMethodTest {
 
   public void testConflictingMembers() { doTest(0); }
   public void testNoConflictingMembers() { doTest(0); }
+  public void testNoConflictingMembers2() { doTest(0); }
 
   public void testThisInsteadOfNoQualifier() {
     doTest(0);