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

Completion: corrected presentation for extension properties

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-11-18 17:53:39 +03:00
parent 386c67925f
commit a26388ef63
4 changed files with 39 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/completion/KotlinLookupElementFactory.kt
+9 -6
View File
@@ -76,12 +76,6 @@ public object KotlinLookupElementFactory {
val returnType = descriptor.getReturnType()
element = element.withTypeText(if (returnType != null) DescriptorRenderer.SHORT_NAMES_IN_TYPES.renderType(returnType) else "")
element = element.appendTailText(DescriptorRenderer.SHORT_NAMES_IN_TYPES.renderFunctionParameters(descriptor), false)
if (descriptor.getExtensionReceiverParameter() != null) {
val tail = " for " + DescriptorRenderer.SHORT_NAMES_IN_TYPES.renderType(descriptor.getExtensionReceiverParameter()!!.getType()) +
" in " + DescriptorUtils.getFqName(descriptor.getContainingDeclaration())
element = element.appendTailText(tail, true)
}
}
is VariableDescriptor -> {
@@ -97,6 +91,15 @@ public object KotlinLookupElementFactory {
}
}
if (descriptor is CallableDescriptor) {
val receiver = descriptor.getExtensionReceiverParameter()
if (receiver != null) {
val tail = " for " + DescriptorRenderer.SHORT_NAMES_IN_TYPES.renderType(receiver.getType()) +
" in " + DescriptorUtils.getFqName(descriptor.getContainingDeclaration())
element = element.appendTailText(tail, true)
}
}
if (KotlinBuiltIns.getInstance().isDeprecated(descriptor)) {
element = element.withStrikeoutness(true)
}