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

Move To Upper Level: Fix target package computation

Browse Source 
#KT-13466 Fixed
This commit is contained in:
Alexey Sedunov
2017-04-11 18:40:19 +03:00
parent fc33d89e28
commit 8df502de84
1 changed files with 13 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
+13 -4
View File
@@ -51,6 +51,7 @@ import org.jetbrains.kotlin.idea.caches.resolve.ResolutionUtils;
import org.jetbrains.kotlin.idea.core.CollectingNameValidator; import org.jetbrains.kotlin.idea.core.CollectingNameValidator;
import org.jetbrains.kotlin.idea.core.KotlinNameSuggester; import org.jetbrains.kotlin.idea.core.KotlinNameSuggester;
import org.jetbrains.kotlin.idea.core.NewDeclarationNameValidator; import org.jetbrains.kotlin.idea.core.NewDeclarationNameValidator;
import org.jetbrains.kotlin.idea.core.PackageUtilsKt;
import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringSettings; import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringSettings;
import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringUtilKt; import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringUtilKt;
import org.jetbrains.kotlin.idea.refactoring.move.MoveUtilsKt; import org.jetbrains.kotlin.idea.refactoring.move.MoveUtilsKt;
@@ -108,6 +109,16 @@ public class MoveKotlinNestedClassesToUpperLevelDialog extends MoveDialogBase {
openInEditorPanel.add(initOpenInEditorCb(), BorderLayout.EAST); openInEditorPanel.add(initOpenInEditorCb(), BorderLayout.EAST);
} }
@Nullable
private static FqName getTargetPackageFqName(PsiElement targetContainer) {
if (targetContainer instanceof PsiDirectory) {
PsiPackage targetPackage = PackageUtilsKt.getPackage((PsiDirectory) targetContainer);
return targetPackage != null ? new FqName(targetPackage.getQualifiedName()) : null;
}
if (targetContainer instanceof KtFile) return ((KtFile) targetContainer).getPackageFqName();
return null;
}
private void createUIComponents() { private void createUIComponents() {
parameterField = new NameSuggestionsField(project); parameterField = new NameSuggestionsField(project);
packageNameField = new PackageNameReferenceEditorCombo("", project, RECENTS_KEY, packageNameField = new PackageNameReferenceEditorCombo("", project, RECENTS_KEY,
@@ -152,9 +163,7 @@ public class MoveKotlinNestedClassesToUpperLevelDialog extends MoveDialogBase {
@Nullable @Nullable
private FqName getTargetPackageFqName() { private FqName getTargetPackageFqName() {
if (targetContainer instanceof PsiDirectory) return innerClass.getContainingKtFile().getPackageFqName(); return getTargetPackageFqName(targetContainer);
if (targetContainer instanceof KtFile) return ((KtFile) targetContainer).getPackageFqName();
return null;
} }
@NotNull @NotNull
@@ -371,7 +380,7 @@ public class MoveKotlinNestedClassesToUpperLevelDialog extends MoveDialogBase {
if (target instanceof PsiDirectory) { if (target instanceof PsiDirectory) {
final PsiDirectory targetDir = (PsiDirectory) target; final PsiDirectory targetDir = (PsiDirectory) target;
final FqName targetPackageFqName = getTargetPackageFqName(); final FqName targetPackageFqName = getTargetPackageFqName(target);
if (targetPackageFqName == null) return; if (targetPackageFqName == null) return;
String innerClassName = innerClass.getName(); String innerClassName = innerClass.getName();