From 05fd4b75dd07e0e7eb9092b37f39be3b8845d465 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Thu, 23 Jul 2015 16:20:23 +0300 Subject: [PATCH] Move: NPE fix #KT-8410 Fixed --- .../KotlinMoveFilesOrDirectoriesHandler.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveFilesOrDirectories/KotlinMoveFilesOrDirectoriesHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveFilesOrDirectories/KotlinMoveFilesOrDirectoriesHandler.kt index 4e80513902e..068b0d49e86 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveFilesOrDirectories/KotlinMoveFilesOrDirectoriesHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveFilesOrDirectories/KotlinMoveFilesOrDirectoriesHandler.kt @@ -37,7 +37,8 @@ public class KotlinMoveFilesOrDirectoriesHandler : MoveFilesOrDirectoriesHandler } override fun canMove(elements: Array, targetContainer: PsiElement?): Boolean { - return super.canMove(adjustElements(elements), targetContainer) + val adjustedElements = adjustElements(elements) ?: return false + return super.canMove(adjustedElements, targetContainer) } override fun adjustForMove(project: Project, sourceElements: Array, targetElement: PsiElement?): Array? {