From d92bfd20d7dcce21be679faf4338e7fb98d7450b Mon Sep 17 00:00:00 2001
From: Alexey Sedunov <alexey.sedunov@jetbrains.com>
Date: Tue, 26 Jan 2016 21:09:21 +0300
Subject: [PATCH] Move Class To Upper Level: Fix file name validation

---
 .../ui/MoveKotlinNestedClassesToUpperLevelDialog.java     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/MoveKotlinNestedClassesToUpperLevelDialog.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/MoveKotlinNestedClassesToUpperLevelDialog.java
index 419fa7f4253..e79f7ccb28c 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/MoveKotlinNestedClassesToUpperLevelDialog.java
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/MoveKotlinNestedClassesToUpperLevelDialog.java
@@ -359,15 +359,17 @@ public class MoveKotlinNestedClassesToUpperLevelDialog extends MoveDialogBase {
             final FqName targetPackageFqName = getTargetPackageFqName();
             if (targetPackageFqName == null) return;
 
+            String innerClassName = innerClass.getName();
+            if (innerClassName == null) return;
             final String targetFileName = KotlinNameSuggester.INSTANCE.suggestNameByName(
-                    innerClass.getName() + "." + KotlinFileType.EXTENSION,
+                    innerClassName,
                     new Function1<String, Boolean>() {
                         @Override
                         public Boolean invoke(String s) {
-                            return targetDir.findFile(s) == null;
+                            return targetDir.findFile(s + "." + KotlinFileType.EXTENSION) == null;
                         }
                     }
-            );
+            ) + "." + KotlinFileType.EXTENSION;
             moveTarget = new KotlinMoveTargetForDeferredFile(
                     targetPackageFqName,
                     targetDir,