MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[kotlin] KTIJ-27084 method renamed

Browse Source 
GitOrigin-RevId: f6aa7808b2f9a1b0fcf4c9e3755d87a6cf804657
This commit is contained in:
Andrew Kozlov
2024-08-21 18:40:50 +00:00
committed by intellij-monorepo-bot
parent e3dc63a40c
commit 3243de7983
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kotlin/completion/impl-k2/src/org/jetbrains/kotlin/idea/completion/impl/k2/contributors/FirImportDirectivePackageMembersCompletionContributor.kt
+2 -2
View File
@@ -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)
plugins/kotlin/completion/impl-k2/src/org/jetbrains/kotlin/idea/completion/impl/k2/contributors/FirPackageCompletionContributor.kt
+2 -2
View File
@@ -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<KaPackageSymbol>()
.singleOrNull()
?: return
plugins/kotlin/completion/impl-k2/src/org/jetbrains/kotlin/idea/completion/impl/k2/contributors/helpers/utils.kt
+3 -3
View File
@@ -38,14 +38,14 @@ internal sealed class CompletionSymbolOrigin {
}
context(KaSession)
internal fun KotlinRawPositionContext.resolveToSymbols(): Sequence<KaSymbol> =
internal fun KotlinRawPositionContext.resolveReceiverToSymbols(): Sequence<KaSymbol> =
when (this) {
is KotlinNameReferencePositionContext -> resolveToSymbols()
is KotlinNameReferencePositionContext -> resolveReceiverToSymbols()
else -> sequenceOf(rootPackageSymbol)
}
context(KaSession)
internal fun KotlinNameReferencePositionContext.resolveToSymbols(): Sequence<KaSymbol> =
internal fun KotlinNameReferencePositionContext.resolveReceiverToSymbols(): Sequence<KaSymbol> =
when (val explicitReceiver = explicitReceiver) {
null -> sequenceOf(rootPackageSymbol)
else -> explicitReceiver.reference()