azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move Class To Upper Level: Fix file name validation

Browse Source
This commit is contained in:
Alexey Sedunov
2016-01-26 21:09:21 +03:00
parent 4f1418bb72
commit d92bfd20d7
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/MoveKotlinNestedClassesToUpperLevelDialog.java
+5 -3
View File
@@ -359,15 +359,17 @@ public class MoveKotlinNestedClassesToUpperLevelDialog extends MoveDialogBase {
final FqName targetPackageFqName = getTargetPackageFqName(); final FqName targetPackageFqName = getTargetPackageFqName();
if (targetPackageFqName == null) return; if (targetPackageFqName == null) return;
String innerClassName = innerClass.getName();
if (innerClassName == null) return;
final String targetFileName = KotlinNameSuggester.INSTANCE.suggestNameByName( final String targetFileName = KotlinNameSuggester.INSTANCE.suggestNameByName(
innerClass.getName() + "." + KotlinFileType.EXTENSION, innerClassName,
new Function1<String, Boolean>() { new Function1<String, Boolean>() {
@Override @Override
public Boolean invoke(String s) { public Boolean invoke(String s) {
return targetDir.findFile(s) == null; return targetDir.findFile(s + "." + KotlinFileType.EXTENSION) == null;
} }
} }
); ) + "." + KotlinFileType.EXTENSION;
moveTarget = new KotlinMoveTargetForDeferredFile( moveTarget = new KotlinMoveTargetForDeferredFile(
targetPackageFqName, targetPackageFqName,
targetDir, targetDir,