Copy/Move: Fix processing of imported Java static members

#KT-18098 Fixed

idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt

@@ -42,6 +42,7 @@ import org.jetbrains.kotlin.idea.refactoring.fqName.isImported
 import org.jetbrains.kotlin.idea.references.KtSimpleNameReference
 import org.jetbrains.kotlin.idea.references.KtSimpleNameReference.ShorteningMode
 import org.jetbrains.kotlin.idea.references.mainReference
+import org.jetbrains.kotlin.load.java.descriptors.JavaCallableMemberDescriptor
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.*
@@ -123,6 +124,17 @@ fun KtElement.processInternalReferencesToUpdateOnPackageNameChange(
         val isExtension = isCallable && refExpr.isExtensionRef(bindingContext)
         val isCallableReference = isCallableReference(refExpr.mainReference)
 
+        val declaration by lazy {
+            var result = DescriptorToSourceUtilsIde.getAnyDeclaration(project, descriptor) ?: return@lazy null
+
+            if (descriptor.isCompanionObject()
+                && bindingContext[BindingContext.SHORT_REFERENCE_TO_COMPANION_OBJECT, refExpr] != null) {
+                result = (result as KtObjectDeclaration).containingClassOrObject ?: result
+            }
+
+            result
+        }
+
         if (isCallable) {
             if (!isCallableReference) {
                 if (isExtension && containingDescriptor is ClassDescriptor) {
@@ -137,17 +149,11 @@ fun KtElement.processInternalReferencesToUpdateOnPackageNameChange(
 
             if (!isExtension) {
                 if (!(containingDescriptor is PackageFragmentDescriptor
-                      || containingDescriptor is ClassDescriptor && containingDescriptor.kind == ClassKind.OBJECT)) return null
+                      || containingDescriptor is ClassDescriptor && containingDescriptor.kind == ClassKind.OBJECT
+                      || descriptor is JavaCallableMemberDescriptor && ((declaration as? PsiMember)?.hasModifierProperty(PsiModifier.STATIC) ?: false))) return null
             }
         }
 
-        var declaration = DescriptorToSourceUtilsIde.getAnyDeclaration(project, descriptor) ?: return null
-
-        if (descriptor.isCompanionObject()
-            && bindingContext[BindingContext.SHORT_REFERENCE_TO_COMPANION_OBJECT, refExpr] != null) {
-            declaration = (declaration as KtObjectDeclaration).containingClassOrObject ?: declaration
-        }
-
         if (!DescriptorUtils.getFqName(descriptor).isSafe) return null
 
         val (oldContainer, newContainer) = containerChangeInfo
@@ -166,6 +172,8 @@ fun KtElement.processInternalReferencesToUpdateOnPackageNameChange(
         val isImported = isImported(descriptor)
         if (isImported && this is KtFile) return null
 
+        if (declaration == null) return null
+
         if (isExtension || containerFqName != null || isImported) return {
             createMoveUsageInfoIfPossible(it.mainReference, declaration, false, true)
         }

idea/testData/refactoring/copy/refToImportJavaStaticField/after/foo/J.java

@@ -0,0 +1,5 @@
+package foo;
+
+public class J {
+    public static int JJJ = 1;
+}

idea/testData/refactoring/copy/refToImportJavaStaticField/after/foo/test.kt

@@ -0,0 +1,7 @@
+package foo
+
+import foo.J.JJJ
+
+fun test() {
+    val x = JJJ
+}

idea/testData/refactoring/copy/refToImportJavaStaticField/after/foo/test2.kt

@@ -0,0 +1,5 @@
+package foo
+
+fun test2() {
+    val x = J.JJJ
+}

idea/testData/refactoring/copy/refToImportJavaStaticField/before/foo/J.java

@@ -0,0 +1,5 @@
+package foo;
+
+public class J {
+    public static int JJJ = 1;
+}

idea/testData/refactoring/copy/refToImportJavaStaticField/before/foo/test.kt

@@ -0,0 +1,7 @@
+package foo
+
+import foo.J.JJJ
+
+fun <caret>test() {
+    val x = JJJ
+}

idea/testData/refactoring/copy/refToImportJavaStaticField/refToImportedJavaStaticField.test

@@ -0,0 +1,5 @@
+{
+  "mainFile": "foo/test.kt",
+  "targetPackage": "foo",
+  "newName": "test2"
+}

idea/testData/refactoring/copy/refToImportJavaStaticMethod/after/foo/J.java

@@ -0,0 +1,7 @@
+package foo;
+
+public class J {
+    public static void jjj() {
+
+    }
+}

idea/testData/refactoring/copy/refToImportJavaStaticMethod/after/foo/test.kt

@@ -0,0 +1,7 @@
+package foo
+
+import foo.J.jjj
+
+fun test() {
+    jjj()
+}

idea/testData/refactoring/copy/refToImportJavaStaticMethod/after/foo/test2.kt

@@ -0,0 +1,5 @@
+package foo
+
+fun test2() {
+    J.jjj()
+}

idea/testData/refactoring/copy/refToImportJavaStaticMethod/before/foo/J.java

@@ -0,0 +1,7 @@
+package foo;
+
+public class J {
+    public static void jjj() {
+
+    }
+}

idea/testData/refactoring/copy/refToImportJavaStaticMethod/before/foo/test.kt

@@ -0,0 +1,7 @@
+package foo
+
+import foo.J.jjj
+
+fun <caret>test() {
+    jjj()
+}

idea/testData/refactoring/copy/refToImportJavaStaticMethod/refToImportedJavaStaticMethod.test

@@ -0,0 +1,5 @@
+{
+  "mainFile": "foo/test.kt",
+  "targetPackage": "foo",
+  "newName": "test2"
+}

idea/tests/org/jetbrains/kotlin/idea/refactoring/copy/CopyTestGenerated.java

@@ -167,4 +167,16 @@ public class CopyTestGenerated extends AbstractCopyTest {
         String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/copy/copyTopLevelPropertyWithRename/copyTopLevelPropertyWithRename.test");
         doTest(fileName);
     }
+
+    @TestMetadata("refToImportJavaStaticField/refToImportedJavaStaticField.test")
+    public void testRefToImportJavaStaticField_RefToImportedJavaStaticField() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/copy/refToImportJavaStaticField/refToImportedJavaStaticField.test");
+        doTest(fileName);
+    }
+
+    @TestMetadata("refToImportJavaStaticMethod/refToImportedJavaStaticMethod.test")
+    public void testRefToImportJavaStaticMethod_RefToImportedJavaStaticMethod() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/copy/refToImportJavaStaticMethod/refToImportedJavaStaticMethod.test");
+        doTest(fileName);
+    }
 }