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

Completion: do not bold top-level functions

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-11-18 17:39:09 +03:00
parent fc993b88ec
commit 386c67925f
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/completion/KotlinLookupElementFactory.kt
+4 -1
View File
@@ -40,7 +40,10 @@ public object KotlinLookupElementFactory {
DescriptorUtils.unwrapFakeOverride(descriptor) DescriptorUtils.unwrapFakeOverride(descriptor)
else else
descriptor 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) return createLookupElement(analyzer, _descriptor, DescriptorToSourceUtils.descriptorToDeclaration(_descriptor), bold)
} }
idea/testData/completion/basic/common/ImmediateMembers5.kt
+3
View File
@@ -1,3 +1,5 @@
fun globalFun(){}
trait T { trait T {
fun fromTrait(){} fun fromTrait(){}
} }
@@ -22,3 +24,4 @@ class Derived : Base() {
// EXIST: { itemText: "fromBase", attributes: "" } // EXIST: { itemText: "fromBase", attributes: "" }
// EXIST: { itemText: "hashCode", attributes: "" } // EXIST: { itemText: "hashCode", attributes: "" }
// EXIST: { itemText: "equals", attributes: "" } // EXIST: { itemText: "equals", attributes: "" }
// EXIST: { itemText: "globalFun", attributes: "" }