From 3243de7983fc91843e62aa8b98c3cdc5b9c7db09 Mon Sep 17 00:00:00 2001 From: Andrew Kozlov Date: Wed, 21 Aug 2024 18:19:32 +0200 Subject: [PATCH] [kotlin] KTIJ-27084 method renamed GitOrigin-RevId: f6aa7808b2f9a1b0fcf4c9e3755d87a6cf804657 --- ...FirImportDirectivePackageMembersCompletionContributor.kt | 4 ++-- .../impl/k2/contributors/FirPackageCompletionContributor.kt | 4 ++-- .../idea/completion/impl/k2/contributors/helpers/utils.kt | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/plugins/kotlin/completion/impl-k2/src/org/jetbrains/kotlin/idea/completion/impl/k2/contributors/FirImportDirectivePackageMembersCompletionContributor.kt b/plugins/kotlin/completion/impl-k2/src/org/jetbrains/kotlin/idea/completion/impl/k2/contributors/FirImportDirectivePackageMembersCompletionContributor.kt index 4cbd0d500a9e..171afe8bde65 100644 --- a/plugins/kotlin/completion/impl-k2/src/org/jetbrains/kotlin/idea/completion/impl/k2/contributors/FirImportDirectivePackageMembersCompletionContributor.kt +++ b/plugins/kotlin/completion/impl-k2/src/org/jetbrains/kotlin/idea/completion/impl/k2/contributors/FirImportDirectivePackageMembersCompletionContributor.kt @@ -6,7 +6,7 @@ import org.jetbrains.kotlin.analysis.api.KaSession import org.jetbrains.kotlin.idea.completion.FirCompletionSessionParameters import org.jetbrains.kotlin.idea.completion.checkers.CompletionVisibilityChecker import org.jetbrains.kotlin.idea.completion.contributors.helpers.CompletionSymbolOrigin -import org.jetbrains.kotlin.idea.completion.contributors.helpers.resolveToSymbols +import org.jetbrains.kotlin.idea.completion.contributors.helpers.resolveReceiverToSymbols import org.jetbrains.kotlin.idea.completion.contributors.helpers.staticScope import org.jetbrains.kotlin.idea.completion.impl.k2.context.FirBasicCompletionContext import org.jetbrains.kotlin.idea.completion.lookups.CallableInsertionOptions @@ -27,7 +27,7 @@ internal class FirImportDirectivePackageMembersCompletionContributor( weighingContext: WeighingContext, sessionParameters: FirCompletionSessionParameters, ) { - positionContext.resolveToSymbols() + positionContext.resolveReceiverToSymbols() .mapNotNull { it.staticScope } .forEach { scopeWithKind -> val symbolOrigin = CompletionSymbolOrigin.Scope(scopeWithKind.kind) diff --git a/plugins/kotlin/completion/impl-k2/src/org/jetbrains/kotlin/idea/completion/impl/k2/contributors/FirPackageCompletionContributor.kt b/plugins/kotlin/completion/impl-k2/src/org/jetbrains/kotlin/idea/completion/impl/k2/contributors/FirPackageCompletionContributor.kt index b6be1ea63f1b..da9c598aa0a1 100644 --- a/plugins/kotlin/completion/impl-k2/src/org/jetbrains/kotlin/idea/completion/impl/k2/contributors/FirPackageCompletionContributor.kt +++ b/plugins/kotlin/completion/impl-k2/src/org/jetbrains/kotlin/idea/completion/impl/k2/contributors/FirPackageCompletionContributor.kt @@ -9,7 +9,7 @@ import org.jetbrains.kotlin.base.analysis.isExcludedFromAutoImport import org.jetbrains.kotlin.idea.completion.FirCompletionSessionParameters import org.jetbrains.kotlin.idea.completion.contributors.helpers.CompletionSymbolOrigin import org.jetbrains.kotlin.idea.completion.contributors.helpers.KtSymbolWithOrigin -import org.jetbrains.kotlin.idea.completion.contributors.helpers.resolveToSymbols +import org.jetbrains.kotlin.idea.completion.contributors.helpers.resolveReceiverToSymbols import org.jetbrains.kotlin.idea.completion.impl.k2.context.FirBasicCompletionContext import org.jetbrains.kotlin.idea.completion.lookups.factories.KotlinFirLookupElementFactory import org.jetbrains.kotlin.idea.completion.weighers.Weighers @@ -29,7 +29,7 @@ internal class FirPackageCompletionContributor( sessionParameters: FirCompletionSessionParameters, ) { - val rootSymbol = positionContext.resolveToSymbols() + val rootSymbol = positionContext.resolveReceiverToSymbols() .filterIsInstance() .singleOrNull() ?: return diff --git a/plugins/kotlin/completion/impl-k2/src/org/jetbrains/kotlin/idea/completion/impl/k2/contributors/helpers/utils.kt b/plugins/kotlin/completion/impl-k2/src/org/jetbrains/kotlin/idea/completion/impl/k2/contributors/helpers/utils.kt index 6c7eb37db6fe..b9b87c41083c 100644 --- a/plugins/kotlin/completion/impl-k2/src/org/jetbrains/kotlin/idea/completion/impl/k2/contributors/helpers/utils.kt +++ b/plugins/kotlin/completion/impl-k2/src/org/jetbrains/kotlin/idea/completion/impl/k2/contributors/helpers/utils.kt @@ -38,14 +38,14 @@ internal sealed class CompletionSymbolOrigin { } context(KaSession) -internal fun KotlinRawPositionContext.resolveToSymbols(): Sequence = +internal fun KotlinRawPositionContext.resolveReceiverToSymbols(): Sequence = when (this) { - is KotlinNameReferencePositionContext -> resolveToSymbols() + is KotlinNameReferencePositionContext -> resolveReceiverToSymbols() else -> sequenceOf(rootPackageSymbol) } context(KaSession) -internal fun KotlinNameReferencePositionContext.resolveToSymbols(): Sequence = +internal fun KotlinNameReferencePositionContext.resolveReceiverToSymbols(): Sequence = when (val explicitReceiver = explicitReceiver) { null -> sequenceOf(rootPackageSymbol) else -> explicitReceiver.reference()