From 9961a5ff16d6017baec462e1de5bc521f7efa767 Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Thu, 18 Sep 2014 16:56:47 +0400 Subject: [PATCH] Minor --- .../completion/DescriptorLookupConverter.kt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/completion/DescriptorLookupConverter.kt b/idea/src/org/jetbrains/jet/plugin/completion/DescriptorLookupConverter.kt index 599596b2876..505208001d7 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/DescriptorLookupConverter.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/DescriptorLookupConverter.kt @@ -36,7 +36,15 @@ import org.jetbrains.jet.plugin.completion.handlers.BaseDeclarationInsertHandler import org.jetbrains.jet.plugin.completion.handlers.JetPropertyInsertHandler public object DescriptorLookupConverter { - public fun createLookupElement(analyzer: KotlinCodeAnalyzer, descriptor: DeclarationDescriptor, declaration: PsiElement?): LookupElement { + public fun createLookupElement(analyzer: KotlinCodeAnalyzer, descriptor: DeclarationDescriptor): LookupElement { + val _descriptor = if (descriptor is CallableMemberDescriptor) + DescriptorUtils.unwrapFakeOverride(descriptor) + else + descriptor + return createLookupElement(analyzer, _descriptor, DescriptorToSourceUtils.descriptorToDeclaration(_descriptor)) + } + + private fun createLookupElement(analyzer: KotlinCodeAnalyzer, descriptor: DeclarationDescriptor, declaration: PsiElement?): LookupElement { val name = descriptor.getName().asString() var element = LookupElementBuilder.create(DeclarationLookupObject(descriptor, analyzer, declaration), name) @@ -108,12 +116,4 @@ public object DescriptorLookupConverter { else -> BaseDeclarationInsertHandler() } } - - public fun createLookupElement(analyzer: KotlinCodeAnalyzer, descriptor: DeclarationDescriptor): LookupElement { - val _descriptor = if (descriptor is CallableMemberDescriptor) - DescriptorUtils.unwrapFakeOverride(descriptor) - else - descriptor - return createLookupElement(analyzer, _descriptor, DescriptorToSourceUtils.descriptorToDeclaration(_descriptor)) - } }