azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#KT-19799: Add initialDirectory to KotlinAwareMoveFilesOrDirectoriesDialog

Browse Source
This commit is contained in:
Vadim Brilyantov
2019-02-11 21:14:39 +03:00
parent 0c1e7e1d63
commit c7acd89fad
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/MoveKotlinDeclarationsHandler.kt
+1 -1
View File
@@ -113,7 +113,7 @@ class MoveKotlinDeclarationsHandler : MoveHandlerDelegate() {
else -> null else -> null
} }
val initialTargetDirectory = MoveFilesOrDirectoriesUtil.resolveToDirectory(project, initialTargetElement) val initialTargetDirectory = MoveFilesOrDirectoriesUtil.resolveToDirectory(project, initialTargetElement)
val dialog = KotlinAwareMoveFilesOrDirectoriesDialog(project) { val dialog = KotlinAwareMoveFilesOrDirectoriesDialog(project, initialTargetDirectory) {
invokeMoveFilesOrDirectoriesRefactoring(it, project, elements, initialTargetDirectory, callback) invokeMoveFilesOrDirectoriesRefactoring(it, project, elements, initialTargetDirectory, callback)
} }
dialog.setData(elements, initialTargetDirectory, "refactoring.moveFile") dialog.setData(elements, initialTargetDirectory, "refactoring.moveFile")
idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/KotlinAwareMoveFilesOrDirectoriesDialog.kt
+7 -1
View File
@@ -42,6 +42,7 @@ import javax.swing.JComponent
class KotlinAwareMoveFilesOrDirectoriesDialog( class KotlinAwareMoveFilesOrDirectoriesDialog(
private val project: Project, private val project: Project,
private val initialDirectory: PsiDirectory?,
private val callback: (KotlinAwareMoveFilesOrDirectoriesDialog?) -> Unit private val callback: (KotlinAwareMoveFilesOrDirectoriesDialog?) -> Unit
) : DialogWrapper(project, true) { ) : DialogWrapper(project, true) {
companion object { companion object {
@@ -163,7 +164,12 @@ class KotlinAwareMoveFilesOrDirectoriesDialog(
project.executeCommand(RefactoringBundle.message("move.title"), null) { project.executeCommand(RefactoringBundle.message("move.title"), null) {
runWriteAction { runWriteAction {
val directoryName = targetDirectoryField.childComponent.text.replace(File.separatorChar, '/') val directoryName = targetDirectoryField.childComponent.text.replace(File.separatorChar, '/').let {
when {
it.startsWith(".") -> (initialDirectory?.virtualFile?.path ?: "") + "/" + it
else -> it
}
}
try { try {
targetDirectory = DirectoryUtil.mkdirs(PsiManager.getInstance(project), directoryName) targetDirectory = DirectoryUtil.mkdirs(PsiManager.getInstance(project), directoryName)
} }
idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveFilesUtil.kt
+1 -1
View File
@@ -123,7 +123,7 @@ fun moveFilesOrDirectories(
return return
} }
with(KotlinAwareMoveFilesOrDirectoriesDialog(project, ::doRun)) { with(KotlinAwareMoveFilesOrDirectoriesDialog(project, initialTargetDirectory, ::doRun)) {
setData(elements, initialTargetDirectory, "refactoring.moveFile") setData(elements, initialTargetDirectory, "refactoring.moveFile")
show() show()
} }