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

#KT-17825: Filter PackageLookupObjects as available for completion

Browse Source
This commit is contained in:
Vadim Brilyantov
2019-02-04 16:11:31 +03:00
parent c5d1190d15
commit f7c4760cb9
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/MoveKotlinNestedClassesDialog.java
+3 -2
View File
@@ -43,6 +43,7 @@ import org.jetbrains.kotlin.asJava.LightClassUtilsKt;
import org.jetbrains.kotlin.asJava.classes.KtLightClassForSourceDeclaration; import org.jetbrains.kotlin.asJava.classes.KtLightClassForSourceDeclaration;
import org.jetbrains.kotlin.idea.completion.CompletionUtilsKt; import org.jetbrains.kotlin.idea.completion.CompletionUtilsKt;
import org.jetbrains.kotlin.idea.core.completion.DeclarationLookupObject; 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.projectView.KtClassOrObjectTreeNode;
import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringUtilKt; import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringUtilKt;
import org.jetbrains.kotlin.idea.refactoring.memberInfo.KotlinMemberInfo; import org.jetbrains.kotlin.idea.refactoring.memberInfo.KotlinMemberInfo;
@@ -169,8 +170,8 @@ public class MoveKotlinNestedClassesDialog extends RefactoringDialog {
Object lookupObject = lookupElement.getObject(); Object lookupObject = lookupElement.getObject();
if (!(lookupObject instanceof DeclarationLookupObject)) return false; if (!(lookupObject instanceof DeclarationLookupObject)) return false;
PsiElement psiElement = ((DeclarationLookupObject) lookupObject).getPsiElement(); PsiElement psiElement = ((DeclarationLookupObject) lookupObject).getPsiElement();
if (!(psiElement instanceof KtClassOrObject)) return false; if (lookupObject instanceof PackageLookupObject) return true;
return KotlinRefactoringUtilKt.canRefactor(psiElement); return (psiElement instanceof KtClassOrObject) && KotlinRefactoringUtilKt.canRefactor(psiElement);
} }
} }
); );