From d37c8397f59ed55a8e500dd56670856e8db4fb60 Mon Sep 17 00:00:00 2001
From: Alexey Sedunov <alexey.sedunov@jetbrains.com>
Date: Mon, 30 Oct 2017 19:52:39 +0300
Subject: [PATCH] Move: Fix applicability check in IDEA 173

---
 .../move/moveDeclarations/MoveKotlinDeclarationsHandler.kt     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/MoveKotlinDeclarationsHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/MoveKotlinDeclarationsHandler.kt
index f551b851c8e..aaa95db02a7 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/MoveKotlinDeclarationsHandler.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/MoveKotlinDeclarationsHandler.kt
@@ -163,7 +163,8 @@ class MoveKotlinDeclarationsHandler : MoveHandlerDelegate() {
     }
 
     private fun canMove(elements: Array<out PsiElement>, targetContainer: PsiElement?, editorMode: Boolean): Boolean {
-        if (!super.canMove(elements, targetContainer)) return false
+        if (targetContainer != null && !isValidTarget(targetContainer, elements)) return false
+
         val container = getUniqueContainer(elements) ?: return false
 
         if (container is KtClassOrObject && targetContainer != null && targetContainer !is KtClassOrObject && elements.size > 1) {