From 7be59f969ce9e068bbccd7952b58f86fe2e48a42 Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Mon, 1 Jun 2015 18:22:50 +0300 Subject: [PATCH] Fixed EA-68869 --- .../kotlin/idea/completion/LookupElementFactory.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/LookupElementFactory.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/LookupElementFactory.kt index 029ff2964cf..ec8330cf13b 100644 --- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/LookupElementFactory.kt +++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/LookupElementFactory.kt @@ -233,12 +233,16 @@ public class LookupElementFactory( return CallableWeight.notApplicableReceiverNullable } else { + if (descriptor !is CallableMemberDescriptor) { + return CallableWeight.local + } + val container = descriptor.getContainingDeclaration() return when (container) { is PackageFragmentDescriptor -> CallableWeight.global is ClassifierDescriptor -> { - if ((descriptor as CallableMemberDescriptor).getKind() == CallableMemberDescriptor.Kind.DECLARATION) + if (descriptor.getKind() == CallableMemberDescriptor.Kind.DECLARATION) CallableWeight.thisClassMember else CallableWeight.baseClassMember