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

Move: Fix ClassCastException on attempt to move several classes (located in different files) to the same file

Browse Source 
#KT-8437 Fixed
This commit is contained in:
Alexey Sedunov
2015-07-24 13:49:10 +03:00
parent e74749eea1
commit 9219f2214e
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsHandler.kt
+9 -11
View File
@@ -20,10 +20,7 @@ import com.intellij.openapi.actionSystem.DataContext
import com.intellij.openapi.actionSystem.LangDataKeys import com.intellij.openapi.actionSystem.LangDataKeys
import com.intellij.openapi.editor.Editor import com.intellij.openapi.editor.Editor
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
import com.intellij.psi.PsiDirectory import com.intellij.psi.*
import com.intellij.psi.PsiElement
import com.intellij.psi.PsiPackage
import com.intellij.psi.PsiReference
import com.intellij.refactoring.JavaRefactoringSettings import com.intellij.refactoring.JavaRefactoringSettings
import com.intellij.refactoring.RefactoringBundle import com.intellij.refactoring.RefactoringBundle
import com.intellij.refactoring.move.MoveCallback import com.intellij.refactoring.move.MoveCallback
@@ -52,12 +49,10 @@ public class MoveKotlinTopLevelDeclarationsHandler : MoveHandlerDelegate() {
val sourceFiles = elementsToSearch.mapTo(LinkedHashSet<JetFile>()) { it.getContainingJetFile() } val sourceFiles = elementsToSearch.mapTo(LinkedHashSet<JetFile>()) { it.getContainingJetFile() }
val sourceFile = sourceFiles.singleOrNull() val sourceFile = sourceFiles.singleOrNull()
if (sourceFile == null) { if (sourceFile == null) {
if (sourceFiles.all { it.getDeclarations().size() == 1 }) { CommonRefactoringUtil.showErrorMessage(RefactoringBundle.message("move.title"),
moveFilesOrDirectories(project, sourceFiles.toTypedArray(), targetContainer) "All declarations must belong to the same file",
return true null,
} project)
CommonRefactoringUtil.showErrorMessage(RefactoringBundle.message("move.title"), "All declarations must belong to the same file", null, project)
return false return false
} }
@@ -76,7 +71,10 @@ public class MoveKotlinTopLevelDeclarationsHandler : MoveHandlerDelegate() {
} }
override fun canMove(elements: Array<out PsiElement>, targetContainer: PsiElement?): Boolean { override fun canMove(elements: Array<out PsiElement>, targetContainer: PsiElement?): Boolean {
return super.canMove(elements, targetContainer) && elements.all { e -> if (!super.canMove(elements, targetContainer)) return false
if (elements.map { it.getContainingFile() }.distinct().size() != 1) return false
return elements.all { e ->
if (e is JetClass || (e is JetObjectDeclaration && !e.isObjectLiteral()) || e is JetNamedFunction || e is JetProperty) { if (e is JetClass || (e is JetObjectDeclaration && !e.isObjectLiteral()) || e is JetNamedFunction || e is JetProperty) {
val parent = e.getParent() val parent = e.getParent()
parent is JetFile && parent.isInJavaSourceRoot() parent is JetFile && parent.isInJavaSourceRoot()