Move: Do not ignore target directory selected in the dialog (DnD mode)

#KT-13901 Fixed

ChangeLog.md

@@ -132,6 +132,7 @@ These artifacts include extensions for the types available in the latter JDKs, s
 - [`KT-13903`](https://youtrack.jetbrains.com/issue/KT-13903) Move: Remove companion object which becomes empty after the move
 - [`KT-13916`](https://youtrack.jetbrains.com/issue/KT-13916) Move: Report visibility conflicts in import directives
 - [`KT-13906`](https://youtrack.jetbrains.com/issue/KT-13906) Move Nested Class to Upper Level: Do not show directory selection dialog twice
+- [`KT-13901`](https://youtrack.jetbrains.com/issue/KT-13901) Move: Do not ignore target directory selected in the dialog (DnD mode)
 
 ##### New features
 

idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.java

@@ -453,14 +453,15 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
             if (ret != Messages.YES) return null;
         }
 
-        PsiDirectory selectedPsiDirectory;
-        if (initialTargetDirectory == null) {
-            DirectoryChooser.ItemWrapper selectedItem = (DirectoryChooser.ItemWrapper)destinationFolderCB.getComboBox().getSelectedItem();
-            selectedPsiDirectory = selectedItem != null ? selectedItem.getDirectory() : null;
-            if (selectedPsiDirectory == null) return Pair.create(null, new MultipleRootsMoveDestination(targetPackage));
-        }
-        else {
-            selectedPsiDirectory = initialTargetDirectory;
+        DirectoryChooser.ItemWrapper selectedItem = (DirectoryChooser.ItemWrapper)destinationFolderCB.getComboBox().getSelectedItem();
+        PsiDirectory selectedPsiDirectory = selectedItem != null ? selectedItem.getDirectory() : null;
+        if (selectedPsiDirectory == null) {
+            if (initialTargetDirectory != null) {
+                selectedPsiDirectory = initialTargetDirectory;
+            }
+            else {
+                return Pair.create(null, new MultipleRootsMoveDestination(targetPackage));
+            }
         }
 
         VirtualFile targetDirectory = selectedPsiDirectory.getVirtualFile();