From 386c67925f54872141943c93ec78a3f4c7234c09 Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Tue, 18 Nov 2014 17:39:09 +0300 Subject: [PATCH] Completion: do not bold top-level functions --- .../jet/plugin/completion/KotlinLookupElementFactory.kt | 5 ++++- idea/testData/completion/basic/common/ImmediateMembers5.kt | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/idea/src/org/jetbrains/jet/plugin/completion/KotlinLookupElementFactory.kt b/idea/src/org/jetbrains/jet/plugin/completion/KotlinLookupElementFactory.kt index 8366860619d..56b966b14c6 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/KotlinLookupElementFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/KotlinLookupElementFactory.kt @@ -40,7 +40,10 @@ public object KotlinLookupElementFactory { DescriptorUtils.unwrapFakeOverride(descriptor) else descriptor - val bold = boldImmediateMembers && descriptor is CallableMemberDescriptor && descriptor.getKind() == CallableMemberDescriptor.Kind.DECLARATION + val bold = boldImmediateMembers + && descriptor is CallableMemberDescriptor + && descriptor.getContainingDeclaration() is ClassifierDescriptor + && descriptor.getKind() == CallableMemberDescriptor.Kind.DECLARATION return createLookupElement(analyzer, _descriptor, DescriptorToSourceUtils.descriptorToDeclaration(_descriptor), bold) } diff --git a/idea/testData/completion/basic/common/ImmediateMembers5.kt b/idea/testData/completion/basic/common/ImmediateMembers5.kt index 0aac2b3b5fc..94faa90d7f8 100644 --- a/idea/testData/completion/basic/common/ImmediateMembers5.kt +++ b/idea/testData/completion/basic/common/ImmediateMembers5.kt @@ -1,3 +1,5 @@ +fun globalFun(){} + trait T { fun fromTrait(){} } @@ -22,3 +24,4 @@ class Derived : Base() { // EXIST: { itemText: "fromBase", attributes: "" } // EXIST: { itemText: "hashCode", attributes: "" } // EXIST: { itemText: "equals", attributes: "" } +// EXIST: { itemText: "globalFun", attributes: "" }