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

Fix of EA-105681 in KotlinProximityStatistician

Browse Source
This commit is contained in:
Mikhail Glukhikh
2017-08-11 14:02:27 +03:00
committed by Mikhail Glukhikh
parent 830b543879
commit 718ee01a48
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/Statisticians.kt
+2 -3
View File
@@ -27,13 +27,12 @@ import org.jetbrains.kotlin.descriptors.ClassDescriptor
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.descriptors.ModuleDescriptor
import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor 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.core.completion.DeclarationLookupObject
import org.jetbrains.kotlin.idea.imports.importableFqName import org.jetbrains.kotlin.idea.imports.importableFqName
import org.jetbrains.kotlin.psi.KtDeclaration import org.jetbrains.kotlin.psi.KtDeclaration
import org.jetbrains.kotlin.renderer.DescriptorRenderer import org.jetbrains.kotlin.renderer.DescriptorRenderer
import org.jetbrains.kotlin.renderer.ParameterNameRenderingPolicy import org.jetbrains.kotlin.renderer.ParameterNameRenderingPolicy
import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
class KotlinCompletionStatistician : CompletionStatistician() { class KotlinCompletionStatistician : CompletionStatistician() {
override fun serialize(element: LookupElement, location: CompletionLocation): StatisticsInfo? { override fun serialize(element: LookupElement, location: CompletionLocation): StatisticsInfo? {
@@ -54,7 +53,7 @@ class KotlinCompletionStatistician : CompletionStatistician() {
class KotlinProximityStatistician : ProximityStatistician() { class KotlinProximityStatistician : ProximityStatistician() {
override fun serialize(element: PsiElement, location: ProximityLocation): StatisticsInfo? { override fun serialize(element: PsiElement, location: ProximityLocation): StatisticsInfo? {
if (element !is KtDeclaration) return null if (element !is KtDeclaration) return null
val descriptor = element.resolveToDescriptor(BodyResolveMode.PARTIAL) val descriptor = element.resolveToDescriptorIfAny() ?: return null
return KotlinStatisticsInfo.forDescriptor(descriptor) return KotlinStatisticsInfo.forDescriptor(descriptor)
} }
} }