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

Move: Process Kotlin files befoire Java files

Browse Source 
This ensures that light classes are updated
before changing references in Java files.

 #KT-10577 Fixed
This commit is contained in:
Alexey Sedunov
2017-03-31 15:56:15 +03:00
parent 2eb912a30c
commit 96b9aba172
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt
+14 -4
View File
@@ -425,10 +425,20 @@ fun invokeMoveFilesOrDirectoriesRefactoring(
try {
val choice = if (elements.size > 1 || elements[0] is PsiDirectory) intArrayOf(-1) else null
val elementsToMove = elements.filterNot {
it is PsiFile
&& runWriteAction { CopyFilesOrDirectoriesHandler.checkFileExist(selectedDir, choice, it, it.name, "Move") }
}
val elementsToMove = elements
.filterNot {
it is PsiFile
&& runWriteAction { CopyFilesOrDirectoriesHandler.checkFileExist(selectedDir, choice, it, it.name, "Move") }
}
.sortedWith( // process Kotlin files first so that light classes are updated before changing references in Java files
Comparator { o1, o2 ->
when {
o1 is KtElement && o2 !is KtElement -> -1
o1 !is KtElement && o2 is KtElement -> 1
else -> 0
}
}
)
elementsToMove.forEach {
MoveFilesOrDirectoriesUtil.checkMove(it, selectedDir!!)