From 718ee01a48836f9aefab5e8e14d2085e2f09e8b3 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Fri, 11 Aug 2017 14:02:27 +0300 Subject: [PATCH] Fix of EA-105681 in KotlinProximityStatistician --- .../org/jetbrains/kotlin/idea/completion/Statisticians.kt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/Statisticians.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/Statisticians.kt index f1f3a93a490..f36d1c7bf8d 100644 --- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/Statisticians.kt +++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/Statisticians.kt @@ -27,13 +27,12 @@ import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor -import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptor +import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny import org.jetbrains.kotlin.idea.core.completion.DeclarationLookupObject import org.jetbrains.kotlin.idea.imports.importableFqName import org.jetbrains.kotlin.psi.KtDeclaration import org.jetbrains.kotlin.renderer.DescriptorRenderer import org.jetbrains.kotlin.renderer.ParameterNameRenderingPolicy -import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode class KotlinCompletionStatistician : CompletionStatistician() { override fun serialize(element: LookupElement, location: CompletionLocation): StatisticsInfo? { @@ -54,7 +53,7 @@ class KotlinCompletionStatistician : CompletionStatistician() { class KotlinProximityStatistician : ProximityStatistician() { override fun serialize(element: PsiElement, location: ProximityLocation): StatisticsInfo? { if (element !is KtDeclaration) return null - val descriptor = element.resolveToDescriptor(BodyResolveMode.PARTIAL) + val descriptor = element.resolveToDescriptorIfAny() ?: return null return KotlinStatisticsInfo.forDescriptor(descriptor) } }