[kotlin] Run import optimizer when no usages are found

Fixes the issue in Kotlin, Java and Groovy. #KTIJ-28288 Fixed

GitOrigin-RevId: 7cd5942539a10f9ccdba386396f15546b0a9ac00

java/java-impl-refactorings/src/com/intellij/refactoring/OptimizeImportsRefactoringHelper.java

@@ -15,8 +15,10 @@ import com.intellij.psi.codeStyle.CodeStyleManager;
 import com.intellij.psi.codeStyle.JavaCodeStyleManager;
 import com.intellij.usageView.UsageInfo;
 import com.intellij.util.IncorrectOperationException;
+import com.intellij.util.ObjectUtils;
 import com.intellij.util.SequentialModalProgressTask;
 import com.intellij.util.SequentialTask;
+import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.*;
@@ -38,12 +40,13 @@ public final class OptimizeImportsRefactoringHelper implements RefactoringHelper
 
   @Override
   public Set<PsiJavaFile> prepareOperation(UsageInfo @NotNull [] usages, @NotNull PsiElement primaryElement) {
-    Set<PsiJavaFile> files = prepareOperation(usages);
-    PsiFile containingFile = primaryElement.getContainingFile();
-    if (containingFile instanceof PsiJavaFile) {
-      files.add((PsiJavaFile)containingFile);
-    }
-    return files;
+    return prepareOperation(usages, List.of(primaryElement));
+  }
+
+  @Override
+  public Set<PsiJavaFile> prepareOperation(UsageInfo @NotNull [] usages, List<@NotNull PsiElement> elements) {
+    Set<PsiJavaFile> movedFiles = ContainerUtil.map2SetNotNull(elements, e -> ObjectUtils.tryCast(e.getContainingFile(), PsiJavaFile.class));
+    return ContainerUtil.union(movedFiles, prepareOperation(usages));
   }
 
   @Override

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/removeUnusedParameter/after1.java

@@ -1,6 +1,4 @@
 // "Safe delete 'i'" "true-preview"
-import java.io.*;
-
 class a {
  private void run(<caret>) {
  }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/removeUnusedParameter/after2.java

@@ -1,6 +1,4 @@
 // "Safe delete 'i'" "true-preview"
-import java.io.*;
-
 class a {
  private void run(int i1, <caret>int ee) {
  }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/removeUnusedParameter/before1.java

@@ -1,6 +1,4 @@
 // "Safe delete 'i'" "true-preview"
-import java.io.*;
-
 class a {
  private void run(int <caret>i) {
  }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/removeUnusedParameter/before2.java

@@ -1,6 +1,4 @@
 // "Safe delete 'i'" "true-preview"
-import java.io.*;
-
 class a {
  private void run(int i1, int <caret>i, int ee) {
  }

java/java-tests/testData/refactoring/moveClass/withoutReference/after/pack2/X.java

@@ -0,0 +1,7 @@
+package pack2;
+
+public class X {
+  public static void main(String[] args) {
+    Y().foo();
+  }
+}

java/java-tests/testData/refactoring/moveClass/withoutReference/after/pack2/Y.java

@@ -0,0 +1,5 @@
+package pack2;
+
+public class Y {
+  void foo() { }
+}

java/java-tests/testData/refactoring/moveClass/withoutReference/before/pack1/X.java

@@ -0,0 +1,9 @@
+package pack1;
+
+import pack2.Y;
+
+public class X {
+  public static void main(String[] args) {
+    Y().foo();
+  }
+}

java/java-tests/testData/refactoring/moveClass/withoutReference/before/pack2/Y.java

@@ -0,0 +1,5 @@
+package pack2;
+
+public class Y {
+  void foo() { }
+}

java/java-tests/testSrc/com/intellij/codeInsight/daemon/impl/quickfix/MoveToPackageTest.java

@@ -16,14 +16,14 @@ public class MoveToPackageTest extends LightJavaCodeInsightFixtureTestCase {
     PsiClass bClass = myFixture.addClass("package foo;\nimport bar.A;\npublic final class B extends A {}");
     myFixture.configureByText("A.java", "package bar;\n import foo.B;\npublic sealed class A permits <caret>B {}");
     invokeFix("Move to package 'bar'");
-    assertEquals("package bar;\nimport bar.A;\npublic final class B extends A {}", bClass.getContainingFile().getText());
+    assertEquals("package bar;\n\npublic final class B extends A {}", bClass.getContainingFile().getText());
   }
 
   public void testNestedClass() {
     PsiClass bClass = myFixture.addClass("package foo;\nimport bar.A;\npublic class B { public static final class C extends A {} }");
     myFixture.configureByText("A.java", "package bar;\n import foo.B;\npublic sealed class A permits <caret>B.C {}");
     invokeFix("Move to package 'bar'");
-    assertEquals("package bar;\nimport bar.A;\npublic class B { public static final class C extends A {} }",
+    assertEquals("package bar;\n\npublic class B { public static final class C extends A {} }",
                  bClass.getContainingFile().getText());
   }
 

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

@@ -93,6 +93,10 @@ public class MoveClassTest extends LightMultiFileTestCase {
     doTest(new String[]{"p2.F2"}, "p1");
   }
 
+  public void testWithoutReference() {
+    doTest(new String[]{"pack1.X"}, "pack2");
+  }
+
   public void testQualifiedRef() {
     doTest(new String[]{"p1.Test"}, "p2");
   }

platform/refactoring/src/com/intellij/refactoring/BaseRefactoringProcessor.java

@@ -505,10 +505,16 @@ public abstract class BaseRefactoringProcessor implements Runnable {
       final Map<RefactoringHelper, Object> preparedData = new LinkedHashMap<>();
       final Runnable prepareHelpersRunnable = () -> {
         RefactoringEventData data = ReadAction.compute(() -> getBeforeData());
-        PsiElement primaryElement = data != null ? data.getUserData(RefactoringEventData.PSI_ELEMENT_KEY) : null;
         for (final RefactoringHelper helper : RefactoringHelper.EP_NAME.getExtensionList()) {
-          Object operation = ReadAction.compute(() -> primaryElement != null ? helper.prepareOperation(writableUsageInfos, primaryElement) 
-                                                                             : helper.prepareOperation(writableUsageInfos));
+          Object operation = ReadAction.compute(() -> {
+            if (data != null) {
+              PsiElement primaryElement = data.getUserData(RefactoringEventData.PSI_ELEMENT_KEY);
+              if (primaryElement != null) return helper.prepareOperation(writableUsageInfos, primaryElement);
+              PsiElement[] elements = data.getUserData(RefactoringEventData.PSI_ELEMENT_ARRAY_KEY);
+              if (elements != null) return helper.prepareOperation(writableUsageInfos, ContainerUtil.filter(elements, e -> e != null));
+            }
+            return helper.prepareOperation(writableUsageInfos);
+          });
           preparedData.put(helper, operation);
         }
       };

platform/refactoring/src/com/intellij/refactoring/RefactoringHelper.java

@@ -8,6 +8,8 @@ import com.intellij.psi.PsiElement;
 import com.intellij.usageView.UsageInfo;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.List;
+
 /**
  * Allows performing cleanup operations after refactoring is done e.g., optimize imports 
  */
@@ -29,6 +31,14 @@ public interface RefactoringHelper<T> {
     return prepareOperation(usages);
   }
 
+  /**
+   * Is used when refactoring provides {@link BaseRefactoringProcessor#getBeforeData()} with all elements,
+   * otherwise {@link #prepareOperation(UsageInfo[])} is used instead
+   */
+  default T prepareOperation(UsageInfo @NotNull [] usages, List<@NotNull PsiElement> elements) {
+    return prepareOperation(usages);
+  }
+
   /**
    * Is invoked in EDT, without WriteAction after refactoring is performed
    * 

plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/GroovyImportOptimizerRefactoringHelper.java

@@ -10,9 +10,12 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.ProjectRootManager;
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.refactoring.RefactoringHelper;
 import com.intellij.usageView.UsageInfo;
+import com.intellij.util.ObjectUtils;
+import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.plugins.groovy.GroovyBundle;
 import org.jetbrains.plugins.groovy.lang.psi.GroovyFile;
@@ -40,6 +43,17 @@ public class GroovyImportOptimizerRefactoringHelper implements RefactoringHelper
     return files;
   }
 
+  @Override
+  public Set<GroovyFile> prepareOperation(UsageInfo @NotNull [] usages, @NotNull PsiElement primaryElement) {
+    return prepareOperation(usages, List.of(primaryElement));
+  }
+
+  @Override
+  public Set<GroovyFile> prepareOperation(UsageInfo @NotNull [] usages, List<@NotNull PsiElement> elements) {
+    Set<GroovyFile> movedFiles = ContainerUtil.map2SetNotNull(elements, e -> ObjectUtils.tryCast(e.getContainingFile(), GroovyFile.class));
+    return ContainerUtil.union(movedFiles, prepareOperation(usages));
+  }
+
   @Override
   public void performOperation(@NotNull final Project project, final Set<GroovyFile> files) {
     final ProgressManager progressManager = ProgressManager.getInstance();

plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/move/GroovyMoveClassTest.groovy

@@ -65,6 +65,10 @@ class GroovyMoveClassTest extends GroovyMoveTestBase {
     doTest("p2", "p1.C1")
   }
 
+  void testWithoutReference() {
+    doTest("p2", "p1.X")
+  }
+
   boolean perform(VirtualFile root, String newPackageName, String... classNames) {
     final PsiClass[] classes = new PsiClass[classNames.length]
     for (int i = 0; i < classes.length; i++) {

plugins/groovy/testdata/refactoring/move/moveClass/withoutReference/after/p2/X.groovy

@@ -0,0 +1,7 @@
+package p2
+
+class X {
+  static void main(String[] args) {
+    Y().foo()
+  }
+}

plugins/groovy/testdata/refactoring/move/moveClass/withoutReference/after/p2/Y.groovy

@@ -0,0 +1,5 @@
+package p2
+
+class Y {
+  void foo() { }
+}

plugins/groovy/testdata/refactoring/move/moveClass/withoutReference/before/p1/X.groovy

@@ -0,0 +1,9 @@
+package p1
+
+import p2.Y
+
+class X {
+  static void main(String[] args) {
+    Y().foo()
+  }
+}

plugins/groovy/testdata/refactoring/move/moveClass/withoutReference/before/p2/Y.groovy

@@ -0,0 +1,5 @@
+package p2
+
+class Y {
+  void foo() { }
+}

plugins/groovy/testdata/refactoring/move/moveScript/moveScriptBasic/after/b/Script.groovy

@@ -1,7 +1,6 @@
 package b
 
-import a.A;
-import b.B;
+import a.A
 
 def a = new A().foo();
 print a;

plugins/groovy/testdata/refactoring/move/moveScript/updateReferences/after/b/Script.groovy

@@ -1,7 +1,6 @@
 package b
 
-import a.A;
-import b.B;
+import a.A
 
 def a = new A().foo();
 print a;

plugins/javaFX/testData/fieldRefactoring/PropertyDelete_after.java

@@ -1,6 +1,3 @@
-import javafx.beans.property.IntegerProperty;
-import javafx.beans.property.SimpleIntegerProperty;
-
 class Test {
 
 }

plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/refactoring/move/MoveTestGenerated.java

@@ -333,6 +333,11 @@ public class MoveTestGenerated extends AbstractMoveTest {
         runTest("testData/refactoring/move/kotlin/moveFile/typeRefWithArguments/typeRefWithArguments.test");
     }
 
+    @TestMetadata("kotlin/moveFile/withoutUsages/withoutUsages.test")
+    public void testKotlin_moveFile_withoutUsages_WithoutUsages() throws Exception {
+        runTest("testData/refactoring/move/kotlin/moveFile/withoutUsages/withoutUsages.test");
+    }
+
     @TestMetadata("kotlin/moveMethod/moveToClass/companionHasReference/companionHasReference.test")
     public void testKotlin_moveMethod_moveToClass_companionHasReference_CompanionHasReference() throws Exception {
         runTest("testData/refactoring/move/kotlin/moveMethod/moveToClass/companionHasReference/companionHasReference.test");

plugins/kotlin/idea/tests/testData/refactoring/move/kotlin/moveFile/withoutUsages/after/b/Y.kt

@@ -0,0 +1,5 @@
+package b
+
+class Y {
+    fun foo() { }
+}

plugins/kotlin/idea/tests/testData/refactoring/move/kotlin/moveFile/withoutUsages/after/b/main.kt

@@ -0,0 +1,7 @@
+package b
+
+// this import should be removed by the import optimizer even though there are no available usages
+
+fun main() {
+    Y().foo()
+}

plugins/kotlin/idea/tests/testData/refactoring/move/kotlin/moveFile/withoutUsages/before/a/main.kt

@@ -0,0 +1,8 @@
+package a
+
+// this import should be removed by the import optimizer even though there are no available usages
+import b.Y
+
+fun main() {
+    Y().foo()
+}

plugins/kotlin/idea/tests/testData/refactoring/move/kotlin/moveFile/withoutUsages/before/b/Y.kt

@@ -0,0 +1,5 @@
+package b
+
+class Y {
+    fun foo() { }
+}

plugins/kotlin/idea/tests/testData/refactoring/move/kotlin/moveFile/withoutUsages/withoutUsages.test

@@ -0,0 +1,7 @@
+{
+  "mainFile": "a/main.kt",
+  "type": "MOVE_FILES",
+  "targetPackage": "b",
+  "enabledInK1": "true",
+  "enabledInK2": "true"
+}

plugins/kotlin/refactorings/kotlin.refactorings.common/src/org/jetbrains/kotlin/idea/refactoring/helper/KotlinOptimizeImportsRefactoringHelper.kt

@@ -92,13 +92,12 @@ class KotlinOptimizeImportsRefactoringHelper : RefactoringHelper<Set<KtFile>> {
         if (!it.isNonCodeUsage) it.file as? KtFile else null
     }
 
-    override fun prepareOperation(usages: Array<out UsageInfo>, primaryElement: PsiElement): Set<KtFile> {
-        val files = super.prepareOperation(usages, primaryElement)
-        val file = primaryElement.containingFile
-        if (file is KtFile) {
-            (files as LinkedHashSet<KtFile>).add(file)
-        }
-        return files
+    override fun prepareOperation(usages: Array<UsageInfo>, primaryElement: PsiElement): Set<KtFile> {
+        return prepareOperation(usages, listOf(primaryElement))
+    }
+
+    override fun prepareOperation(usages: Array<UsageInfo>, elements: List<PsiElement>): Set<KtFile> {
+        return elements.mapNotNull { it.containingFile as? KtFile }.toSet() + prepareOperation(usages)
     }
 
     override fun performOperation(project: Project, operationData: Set<KtFile>) {

plugins/kotlin/refactorings/kotlin.refactorings.move.k2/test/org/jetbrains/kotlin/idea/k2/refactoring/move/K2MoveTestGenerated.java

@@ -333,6 +333,11 @@ public class K2MoveTestGenerated extends AbstractK2MoveTest {
         runTest("../../idea/tests/testData/refactoring/move/kotlin/moveFile/typeRefWithArguments/typeRefWithArguments.test");
     }
 
+    @TestMetadata("kotlin/moveFile/withoutUsages/withoutUsages.test")
+    public void testKotlin_moveFile_withoutUsages_WithoutUsages() throws Exception {
+        runTest("../../idea/tests/testData/refactoring/move/kotlin/moveFile/withoutUsages/withoutUsages.test");
+    }
+
     @TestMetadata("kotlin/moveMethod/moveToClass/companionHasReference/companionHasReference.test")
     public void testKotlin_moveMethod_moveToClass_companionHasReference_CompanionHasReference() throws Exception {
         runTest("../../idea/tests/testData/refactoring/move/kotlin/moveMethod/moveToClass/companionHasReference/companionHasReference.test");