Move Class To Upper Level: Fix file name validation

2016-01-26 21:09:21 +03:00
parent 4f1418bb72
commit d92bfd20d7
1 changed files with 5 additions and 3 deletions
@@ -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,