move members: update static imports when methods are overridden (IDEA-93741)

java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java

@@ -238,7 +238,12 @@ public class RefactoringUtil {
       if (importList != null) {
         final PsiImportStaticStatement[] importStaticStatements = importList.getImportStaticStatements();
         for(PsiImportStaticStatement stmt: importStaticStatements) {
-          if (!stmt.isOnDemand() && stmt.resolveTargetClass() == member.getContainingClass() && Comparing.strEqual(stmt.getReferenceName(), member.getName())) {
+          final PsiClass containingClass = member.getContainingClass();
+          final String referenceName = stmt.getReferenceName();
+          if (!stmt.isOnDemand() && stmt.resolveTargetClass() == containingClass && Comparing.strEqual(referenceName, member.getName())) {
+            if (member instanceof PsiMethod) {
+              return containingClass.findMethodsByName(referenceName, false).length == 1;
+            }
             return true;
           }
         }

java/java-tests/testData/refactoring/moveMembers/staticImportAndOverridenMethods/after/bar/A.java

@@ -0,0 +1,5 @@
+package bar;
+
+public class A {
+    public static void foo() {}
+}

java/java-tests/testData/refactoring/moveMembers/staticImportAndOverridenMethods/after/bar/B.java

@@ -0,0 +1,5 @@
+package bar;
+
+public class B {
+    public static void foo(String s) {}
+}

java/java-tests/testData/refactoring/moveMembers/staticImportAndOverridenMethods/after/bar/U.java

@@ -0,0 +1,7 @@
+import bar.A;
+
+class Usage {
+  void bar() {
+    A.foo();
+  }
+}

java/java-tests/testData/refactoring/moveMembers/staticImportAndOverridenMethods/before/bar/A.java

@@ -0,0 +1,4 @@
+package bar;
+
+public class A {
+}

java/java-tests/testData/refactoring/moveMembers/staticImportAndOverridenMethods/before/bar/B.java

@@ -0,0 +1,6 @@
+package bar;
+
+public class B {
+    public static void foo() {}
+    public static void foo(String s) {}
+}

java/java-tests/testData/refactoring/moveMembers/staticImportAndOverridenMethods/before/bar/U.java

@@ -0,0 +1,7 @@
+import static bar.B.foo;
+
+class Usage {
+  void bar() {
+    foo();
+  }
+}

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

@@ -105,6 +105,10 @@ public class MoveMembersTest extends MultiFileTestCase {
     doTest("B", "A", 0);
   }
 
+  public void testStaticImportAndOverridenMethods() throws Exception {
+    doTest("bar.B", "bar.A", 0);
+  }
+
   public void testWritableField() throws Exception {
     try {
       doTest("B", "A", 0);