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

Copy: CopyFileHandler must support all elements inside of Kotlin file (in the absence of more specific handlers)

Browse Source 
#KT-8175 Fixed
This commit is contained in:
Alexey Sedunov
2015-06-19 21:01:30 +03:00
parent cbdaf2a151
commit 6055933258
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/copy/CopyKotlinFileHandler.kt
+2 -12
View File
@@ -18,27 +18,17 @@ package org.jetbrains.kotlin.idea.refactoring.copy
import com.intellij.psi.PsiDirectory import com.intellij.psi.PsiDirectory
import com.intellij.psi.PsiElement import com.intellij.psi.PsiElement
import com.intellij.psi.PsiFile
import com.intellij.refactoring.copy.CopyFilesOrDirectoriesHandler import com.intellij.refactoring.copy.CopyFilesOrDirectoriesHandler
import com.intellij.refactoring.copy.CopyHandlerDelegateBase import com.intellij.refactoring.copy.CopyHandlerDelegateBase
import org.jetbrains.kotlin.psi.JetClassOrObject
import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.psi.JetFile
public class CopyKotlinFileHandler : CopyHandlerDelegateBase() { public class CopyKotlinFileHandler : CopyHandlerDelegateBase() {
private val delegate = CopyFilesOrDirectoriesHandler() private val delegate = CopyFilesOrDirectoriesHandler()
private fun adjustElements(elements: Array<out PsiElement>): Array<PsiElement>? { private fun adjustElements(elements: Array<out PsiElement>): Array<PsiElement>? {
val adjustedElements = elements return elements
.map { .map { it.getContainingFile() as? JetFile ?: return null }
val file = it.getContainingFile()
when {
it is JetFile -> it
it is JetClassOrObject && it.isTopLevel() && (file as JetFile).getDeclarations().size() == 1 -> file
else -> return null
}
}
.toTypedArray() .toTypedArray()
return adjustedElements
} }
override fun canCopy(elements: Array<out PsiElement>, fromUpdate: Boolean): Boolean { override fun canCopy(elements: Array<out PsiElement>, fromUpdate: Boolean): Boolean {