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

Fixed EA-68869

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-06-01 18:22:50 +03:00
parent 662cc325f4
commit 7be59f969c
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/LookupElementFactory.kt
+5 -1
View File
@@ -233,12 +233,16 @@ public class LookupElementFactory(
return CallableWeight.notApplicableReceiverNullable return CallableWeight.notApplicableReceiverNullable
} }
else { else {
if (descriptor !is CallableMemberDescriptor) {
return CallableWeight.local
}
val container = descriptor.getContainingDeclaration() val container = descriptor.getContainingDeclaration()
return when (container) { return when (container) {
is PackageFragmentDescriptor -> CallableWeight.global is PackageFragmentDescriptor -> CallableWeight.global
is ClassifierDescriptor -> { is ClassifierDescriptor -> {
if ((descriptor as CallableMemberDescriptor).getKind() == CallableMemberDescriptor.Kind.DECLARATION) if (descriptor.getKind() == CallableMemberDescriptor.Kind.DECLARATION)
CallableWeight.thisClassMember CallableWeight.thisClassMember
else else
CallableWeight.baseClassMember CallableWeight.baseClassMember