diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/cutPaste/MoveDeclarationsCopyPasteProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/cutPaste/MoveDeclarationsCopyPasteProcessor.kt index 60b663ebe81..320e0d02b0e 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/cutPaste/MoveDeclarationsCopyPasteProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/cutPaste/MoveDeclarationsCopyPasteProcessor.kt @@ -75,7 +75,14 @@ class MoveDeclarationsCopyPasteProcessor : CopyPastePostProcessor { diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/cutPaste/MoveDeclarationsProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/cutPaste/MoveDeclarationsProcessor.kt index 8a14db49228..7f053e37b0f 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/cutPaste/MoveDeclarationsProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/cutPaste/MoveDeclarationsProcessor.kt @@ -76,8 +76,9 @@ class MoveDeclarationsProcessor( if (sourceContainer == sourcePsiFile && sourcePsiFile.packageFqName == targetPsiFile.packageFqName) return null // check that declarations were cut (not copied) - val filteredDeclarations = sourceContainer.declarations.filter { it in data.declarations } - if (filteredDeclarations.isNotEmpty()) return null + if (sourceContainer.declarations.any { declaration -> declaration.text in data.declarationTexts }) { + return null + } return MoveDeclarationsProcessor( project, @@ -85,7 +86,7 @@ class MoveDeclarationsProcessor( targetPsiFile, declarations, data.imports, - data.declarations.map { it.text } + data.declarationTexts ) } } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/cutPaste/MoveDeclarationsTransferableData.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/cutPaste/MoveDeclarationsTransferableData.kt index 4a500f0872d..b22afc6de23 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/cutPaste/MoveDeclarationsTransferableData.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/cutPaste/MoveDeclarationsTransferableData.kt @@ -18,13 +18,12 @@ package org.jetbrains.kotlin.idea.refactoring.cutPaste import com.intellij.codeInsight.editorActions.TextBlockTransferableData import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers -import org.jetbrains.kotlin.psi.KtNamedDeclaration import java.awt.datatransfer.DataFlavor class MoveDeclarationsTransferableData( val sourceFileUrl: String, val sourceObjectFqName: String?, - val declarations: List, + val declarationTexts: List, val imports: List ) : TextBlockTransferableData {