From 24c1d9f90bb74cd1c8898af232fded052e342f0a Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Wed, 7 Dec 2016 19:30:04 +0300
Subject: [PATCH] Compilation fix due to added @NotNull annotation on
 MoveFilesOrDirectoriesUtil.doMoveFile

---
 .../move/moveFilesOrDirectories/MoveKotlinFileHandler.kt    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveFilesOrDirectories/MoveKotlinFileHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveFilesOrDirectories/MoveKotlinFileHandler.kt
index 47ef0727d73..dd43aba0ac7 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveFilesOrDirectories/MoveKotlinFileHandler.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveFilesOrDirectories/MoveKotlinFileHandler.kt
@@ -78,8 +78,10 @@ class MoveKotlinFileHandler : MoveFileHandler() {
             ContainerInfo.UnknownPackage -> EmptyKotlinMoveTarget
 
             else -> KotlinMoveTargetForDeferredFile(newPackage.fqName!!, newParent) {
-                MoveFilesOrDirectoriesUtil.doMoveFile(psiFile, newParent)
-                newParent?.findFile(psiFile.name) as? KtFile
+                newParent?.let {
+                    MoveFilesOrDirectoriesUtil.doMoveFile(psiFile, it)
+                    it.findFile(psiFile.name) as? KtFile
+                }
             }
         }