Move: Drop Java on-demand static imports of facade class members when original facade is eliminated due to Move refactoring

#KT-9624 Fixed

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

@@ -209,8 +209,12 @@ private fun updateJavaReference(reference: PsiReferenceExpression, oldElement: P
         // Remove import of old package facade, if any
         val oldClassName = oldElement.getContainingClass()?.getQualifiedName()
         if (oldClassName != null) {
-            val importOfOldClass = (reference.getContainingFile() as? PsiJavaFile)?.getImportList()?.getImportStatements()?.firstOrNull {
-                it.getQualifiedName() == oldClassName
+            val importOfOldClass = (reference.containingFile as? PsiJavaFile)?.importList?.allImportStatements?.firstOrNull {
+                when (it) {
+                    is PsiImportStatement -> it.qualifiedName == oldClassName
+                    is PsiImportStaticStatement -> it.isOnDemand && it.importReference?.canonicalText == oldClassName
+                    else -> false
+                }
             }
             if (importOfOldClass != null && importOfOldClass.resolve() == null) {
                 importOfOldClass.delete()

idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/a/onDemandStaticImport.java

@@ -2,8 +2,6 @@ package a;
 
 import b.Test;
 
-import static a.MainKt.*;
-
 class J {
     void bar() {
         Test t = new Test();

idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/c/onDemandStaticImport.java

@@ -2,8 +2,6 @@ package c;
 
 import b.Test;
 
-import static a.MainKt.*;
-
 class J {
     void bar() {
         Test t = new Test();

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/a/onDemandStaticImport.java

@@ -1,7 +1,5 @@
 package a;
 
-import static a.MainKt.*;
-
 class J {
     void bar() {
         b.DependencyKt.test(new Test());

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/onDemandStaticImport.java

@@ -1,7 +1,5 @@
 package b;
 
-import static a.MainKt.*;
-
 class J {
     void bar() {
         b.DependencyKt.test(new a.Test());

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/onDemandStaticImport.java

@@ -1,7 +1,5 @@
 package c;
 
-import static a.MainKt.*;
-
 class J {
     void bar() {
         b.DependencyKt.test(new a.Test());

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/a/onDemandStaticImport.java

@@ -1,7 +1,5 @@
 package a;
 
-import static a.MainKt.*;
-
 class J {
     void bar() {
         b.DependencyKt.getTest(new Test());

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/onDemandStaticImport.java

@@ -1,7 +1,5 @@
 package b;
 
-import static a.MainKt.*;
-
 class J {
     void bar() {
         b.DependencyKt.getTest(new a.Test());

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/onDemandStaticImport.java

@@ -1,7 +1,5 @@
 package c;
 
-import static a.MainKt.*;
-
 class J {
     void bar() {
         b.DependencyKt.getTest(new a.Test());

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/a/onDemandStaticImport.java

@@ -1,7 +1,5 @@
 package a;
 
-import static a.MainKt.*;
-
 class J {
     void bar() {
         b.DependencyKt.test();

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/onDemandStaticImport.java

@@ -1,7 +1,5 @@
 package b;
 
-import static a.MainKt.*;
-
 class J {
     void bar() {
         b.DependencyKt.test();

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/onDemandStaticImport.java

@@ -1,7 +1,5 @@
 package c;
 
-import static a.MainKt.*;
-
 class J {
     void bar() {
         b.DependencyKt.test();

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/a/onDemandStaticImport.java

@@ -1,7 +1,5 @@
 package a;
 
-import static a.MainKt.*;
-
 class J {
     void bar() {
         b.TestKt.test();

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/onDemandStaticImport.java

@@ -1,7 +1,5 @@
 package b;
 
-import static a.MainKt.*;
-
 class J {
     void bar() {
         b.TestKt.test();

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/onDemandStaticImport.java

@@ -1,7 +1,5 @@
 package c;
 
-import static a.MainKt.*;
-
 class J {
     void bar() {
         b.TestKt.test();

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/a/onDemandStaticImport.java

@@ -1,7 +1,5 @@
 package a;
 
-import static a.MainKt.*;
-
 class J {
     void bar() {
         b.DependencyKt.setTest("");

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/onDemandStaticImport.java

@@ -1,7 +1,5 @@
 package b;
 
-import static a.MainKt.*;
-
 class J {
     void bar() {
         b.DependencyKt.setTest("");

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/onDemandStaticImport.java

@@ -1,7 +1,5 @@
 package c;
 
-import static a.MainKt.*;
-
 class J {
     void bar() {
         b.DependencyKt.setTest("");

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/a/onDemandStaticImport.java

@@ -1,7 +1,5 @@
 package a;
 
-import static a.MainKt.*;
-
 class J {
     void bar() {
         b.TestKt.setTest("");

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/onDemandStaticImport.java

@@ -1,7 +1,5 @@
 package b;
 
-import static a.MainKt.*;
-
 class J {
     void bar() {
         b.TestKt.setTest("");

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/onDemandStaticImport.java

@@ -1,7 +1,5 @@
 package c;
 
-import static a.MainKt.*;
-
 class J {
     void bar() {
         b.TestKt.setTest("");