move static members with static non-demand imports to preseve non-demand (IDEADEV-40862)

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

@@ -71,7 +71,7 @@ public class MoveJavaMemberHandler implements MoveMemberHandler {
     return null;
   }
 
-  private boolean isInMovedElement(PsiElement element, Set<PsiMember> membersToMove) {
+  private static boolean isInMovedElement(PsiElement element, Set<PsiMember> membersToMove) {
     for (PsiMember member : membersToMove) {
       if (PsiTreeUtil.isAncestor(member, element, false)) return true;
     }
@@ -86,7 +86,7 @@ public class MoveJavaMemberHandler implements MoveMemberHandler {
       PsiExpression qualifier = refExpr.getQualifierExpression();
       if (qualifier != null) {
         if (usage.qualifierClass != null) {
-          changeQualifier(refExpr, usage.qualifierClass);
+          changeQualifier(refExpr, usage.qualifierClass, usage.member);
         }
         else {
           refExpr.setQualifierExpression(null);
@@ -94,7 +94,7 @@ public class MoveJavaMemberHandler implements MoveMemberHandler {
       }
       else { // no qualifier
         if (usage.qualifierClass != null) {
-          changeQualifier(refExpr, usage.qualifierClass);
+          changeQualifier(refExpr, usage.qualifierClass, usage.member);
         }
       }
       return true;
@@ -136,11 +136,11 @@ public class MoveJavaMemberHandler implements MoveMemberHandler {
     ChangeContextUtil.decodeContextInfo(scope, null, null);
   }
 
-  private void changeQualifier(PsiReferenceExpression refExpr, PsiClass aClass) throws IncorrectOperationException {
+  private static void changeQualifier(PsiReferenceExpression refExpr, PsiClass aClass, PsiMember member) throws IncorrectOperationException {
     if (RefactoringUtil.hasOnDemandStaticImport(refExpr, aClass)) {
       refExpr.setQualifierExpression(null);
     }
-    else {
+    else if (!RefactoringUtil.hasStaticImportOn(refExpr, member.getContainingClass(), member)){
       PsiElementFactory factory = JavaPsiFacade.getInstance(refExpr.getProject()).getElementFactory();
       refExpr.setQualifierExpression(factory.createReferenceExpression(aClass));
     }

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

@@ -224,6 +224,21 @@ public class RefactoringUtil {
     return false;
   }
 
+   public static boolean hasStaticImportOn(final PsiReferenceExpression expr, final PsiClass aClass, final PsiMember member) {
+    if (expr.getContainingFile() instanceof PsiJavaFile) {
+      final PsiImportList importList = ((PsiJavaFile)expr.getContainingFile()).getImportList();
+      if (importList != null) {
+        final PsiImportStaticStatement[] importStaticStatements = importList.getImportStaticStatements();
+        for(PsiImportStaticStatement stmt: importStaticStatements) {
+          if (!stmt.isOnDemand() && stmt.resolveTargetClass() == aClass && Comparing.strEqual(stmt.getReferenceName(), member.getName())) {
+            return true;
+          }
+        }
+      }
+    }
+    return false;
+  }
+
   public static PsiElement replaceElementsWithMap(PsiElement replaceIn, final Map<PsiElement, PsiElement> elementsToReplace) throws IncorrectOperationException {
     for(Map.Entry<PsiElement, PsiElement> e: elementsToReplace.entrySet()) {
       if (e.getKey() == replaceIn) {

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

@@ -0,0 +1,7 @@
+import static B.Z;
+
+public class A {
+  public static void main(String[] args) {
+    System.out.println("Z = " + Z);
+  }
+}

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

@@ -0,0 +1,3 @@
+public class B {
+    public static final String Z = "z";
+}

java/java-tests/testData/refactoring/moveMembers/explicitStaticImport/after/C.java

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

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

@@ -0,0 +1,7 @@
+import static C.Z;
+
+public class A {
+  public static void main(String[] args) {
+    System.out.println("Z = " + Z);
+  }
+}

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

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

java/java-tests/testData/refactoring/moveMembers/explicitStaticImport/before/C.java

@@ -0,0 +1,3 @@
+public class C {
+  public static final String Z = "z";
+}

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

@@ -69,6 +69,10 @@ public class MoveMembersTest extends MultiFileTestCase {
     doTest("C", "B", 0);
   }
 
+  public void testExplicitStaticImport() throws Exception {
+    doTest("C", "B", 0);
+  }
+
   public void testProtectedConstructor() throws Exception {
     doTest("pack1.A", "pack1.C", 0);
   }