move static: correctly process ambiguity between moved members (IDEA-114908)

java/java-impl/src/com/intellij/refactoring/move/moveMembers/MoveJavaMemberHandler.java

@@ -58,7 +58,7 @@ public class MoveJavaMemberHandler implements MoveMemberHandler {
         else {
           if (qualifier instanceof PsiReferenceExpression &&
               ((PsiReferenceExpression)qualifier).isReferenceTo(member.getContainingClass())) {
-            return new MoveMembersProcessor.MoveMembersUsageInfo(member, refExpr, null, qualifier, psiReference);  // change qualifier
+            return new MoveMembersProcessor.MoveMembersUsageInfo(member, refExpr, targetClass, qualifier, psiReference);  // change qualifier
           }
         }
       }

java/java-tests/testData/refactoring/moveMembers/multipleWithDependencies1/after/A.java

@@ -0,0 +1,2 @@
+public class A {
+}

java/java-tests/testData/refactoring/moveMembers/multipleWithDependencies1/after/B.java

@@ -0,0 +1,10 @@
+public class B {
+    static void foo() {
+    }
+
+    static class Bar {
+        void foo() {
+            B.foo();
+        }
+    }
+}

java/java-tests/testData/refactoring/moveMembers/multipleWithDependencies1/before/A.java

@@ -0,0 +1,10 @@
+public class A {
+      static void foo() {
+      }
+  
+      static class Bar {
+          void foo() {
+              A.foo();
+          }
+      }
+}

java/java-tests/testData/refactoring/moveMembers/multipleWithDependencies1/before/B.java

@@ -0,0 +1,2 @@
+public class B {
+}

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

@@ -163,6 +163,10 @@ public class MoveMembersTest extends MultiFileTestCase {
     doTest("A", "B", true, VisibilityUtil.ESCALATE_VISIBILITY, 0, 1);
   }
 
+  public void testMultipleWithDependencies1() throws Exception {
+    doTest("A", "B", true, VisibilityUtil.ESCALATE_VISIBILITY, 0, 1);
+  }
+
   public void testFromNestedToOuter() throws Exception {
     doTest("Outer.Inner", "Outer", true, VisibilityUtil.ESCALATE_VISIBILITY, 0);
   }