From f7c4760cb933233095017ac8c6ae5dc51ca59f93 Mon Sep 17 00:00:00 2001 From: Vadim Brilyantov Date: Mon, 4 Feb 2019 16:11:31 +0300 Subject: [PATCH] #KT-17825: Filter PackageLookupObjects as available for completion --- .../moveDeclarations/ui/MoveKotlinNestedClassesDialog.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/MoveKotlinNestedClassesDialog.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/MoveKotlinNestedClassesDialog.java index 516797e2e8c..a6552f6cf28 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/MoveKotlinNestedClassesDialog.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/MoveKotlinNestedClassesDialog.java @@ -43,6 +43,7 @@ import org.jetbrains.kotlin.asJava.LightClassUtilsKt; import org.jetbrains.kotlin.asJava.classes.KtLightClassForSourceDeclaration; import org.jetbrains.kotlin.idea.completion.CompletionUtilsKt; import org.jetbrains.kotlin.idea.core.completion.DeclarationLookupObject; +import org.jetbrains.kotlin.idea.core.completion.PackageLookupObject; import org.jetbrains.kotlin.idea.projectView.KtClassOrObjectTreeNode; import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringUtilKt; import org.jetbrains.kotlin.idea.refactoring.memberInfo.KotlinMemberInfo; @@ -169,8 +170,8 @@ public class MoveKotlinNestedClassesDialog extends RefactoringDialog { Object lookupObject = lookupElement.getObject(); if (!(lookupObject instanceof DeclarationLookupObject)) return false; PsiElement psiElement = ((DeclarationLookupObject) lookupObject).getPsiElement(); - if (!(psiElement instanceof KtClassOrObject)) return false; - return KotlinRefactoringUtilKt.canRefactor(psiElement); + if (lookupObject instanceof PackageLookupObject) return true; + return (psiElement instanceof KtClassOrObject) && KotlinRefactoringUtilKt.canRefactor(psiElement); } } );