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

Move Class to Top Leve: Suggest file name based on new class name

Browse Source 
#KT-17977 Fixed
This commit is contained in:
Alexey Sedunov
2018-01-29 16:13:10 +03:00
parent 4d52bf04fe
commit 8c9c1609c0
1 changed files with 3 additions and 4 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
+3 -4
View File
@@ -376,6 +376,8 @@ public class MoveKotlinNestedClassesToUpperLevelDialog extends MoveDialogBase {
settings.MOVE_TO_UPPER_LEVEL_SEARCH_FOR_TEXT = searchForTextOccurrencesCheckBox.isSelected(); settings.MOVE_TO_UPPER_LEVEL_SEARCH_FOR_TEXT = searchForTextOccurrencesCheckBox.isSelected();
settings.MOVE_TO_UPPER_LEVEL_SEARCH_IN_COMMENTS = searchInCommentsCheckBox.isSelected(); settings.MOVE_TO_UPPER_LEVEL_SEARCH_IN_COMMENTS = searchInCommentsCheckBox.isSelected();
String newClassName = getClassName();
KotlinMoveTarget moveTarget; KotlinMoveTarget moveTarget;
if (target instanceof PsiDirectory) { if (target instanceof PsiDirectory) {
final PsiDirectory targetDir = (PsiDirectory) target; final PsiDirectory targetDir = (PsiDirectory) target;
@@ -383,10 +385,8 @@ public class MoveKotlinNestedClassesToUpperLevelDialog extends MoveDialogBase {
final FqName targetPackageFqName = getTargetPackageFqName(target); final FqName targetPackageFqName = getTargetPackageFqName(target);
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(
innerClassName, newClassName,
new Function1<String, Boolean>() { new Function1<String, Boolean>() {
@Override @Override
public Boolean invoke(String s) { public Boolean invoke(String s) {
@@ -412,7 +412,6 @@ public class MoveKotlinNestedClassesToUpperLevelDialog extends MoveDialogBase {
} }
String outerInstanceParameterName = passOuterClassCheckBox.isSelected() ? getParameterName() : null; String outerInstanceParameterName = passOuterClassCheckBox.isSelected() ? getParameterName() : null;
String newClassName = getClassName();
MoveDeclarationsDelegate delegate = new MoveDeclarationsDelegate.NestedClass(newClassName, outerInstanceParameterName); MoveDeclarationsDelegate delegate = new MoveDeclarationsDelegate.NestedClass(newClassName, outerInstanceParameterName);
MoveDeclarationsDescriptor moveDescriptor = new MoveDeclarationsDescriptor( MoveDeclarationsDescriptor moveDescriptor = new MoveDeclarationsDescriptor(
project, project,