From a9f7c153d2b1231792f80659ae37ccdc0ca3ee27 Mon Sep 17 00:00:00 2001 From: Dmitrii Gridin Date: Fri, 16 Feb 2024 18:34:27 +0100 Subject: [PATCH] [LL FIR] rename LLFirResolveMultiDesignationCollector to LLFirResolveDesignationCollector As it is not "multi" after 77c850f0d0a8f7a15b208db4c8b7f5095c1649a6 --- .../fir/lazy/resolve/LLFirModuleLazyDeclarationResolver.kt | 6 +++--- ...tionCollector.kt => LLFirResolveDesignationCollector.kt} | 2 +- .../AbstractFirLazyDeclarationResolveOverAllPhasesTest.kt | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) rename analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/{LLFirResolveMultiDesignationCollector.kt => LLFirResolveDesignationCollector.kt} (98%) diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/LLFirModuleLazyDeclarationResolver.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/LLFirModuleLazyDeclarationResolver.kt index ed6f324f50f..773d67fb557 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/LLFirModuleLazyDeclarationResolver.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/LLFirModuleLazyDeclarationResolver.kt @@ -35,7 +35,7 @@ internal class LLFirModuleLazyDeclarationResolver(val moduleComponents: LLFirMod toPhase: FirResolvePhase, ) { if (target.resolvePhase >= toPhase) return - lazyResolve(target, scopeSession, toPhase, LLFirResolveMultiDesignationCollector::getDesignationToResolve) + lazyResolve(target, scopeSession, toPhase, LLFirResolveDesignationCollector::getDesignationToResolve) } /** @@ -50,7 +50,7 @@ internal class LLFirModuleLazyDeclarationResolver(val moduleComponents: LLFirMod scopeSession: ScopeSession, toPhase: FirResolvePhase, ) { - lazyResolve(target, scopeSession, toPhase, LLFirResolveMultiDesignationCollector::getDesignationToResolveWithCallableMembers) + lazyResolve(target, scopeSession, toPhase, LLFirResolveDesignationCollector::getDesignationToResolveWithCallableMembers) } /** @@ -65,7 +65,7 @@ internal class LLFirModuleLazyDeclarationResolver(val moduleComponents: LLFirMod scopeSession: ScopeSession, toPhase: FirResolvePhase, ) { - lazyResolve(target, scopeSession, toPhase, LLFirResolveMultiDesignationCollector::getDesignationToResolveRecursively) + lazyResolve(target, scopeSession, toPhase, LLFirResolveDesignationCollector::getDesignationToResolveRecursively) } private inline fun lazyResolve( diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/LLFirResolveMultiDesignationCollector.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/LLFirResolveDesignationCollector.kt similarity index 98% rename from analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/LLFirResolveMultiDesignationCollector.kt rename to analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/LLFirResolveDesignationCollector.kt index b743f621ad9..0a574f5dbb3 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/LLFirResolveMultiDesignationCollector.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/LLFirResolveDesignationCollector.kt @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.declarations.synthetic.FirSyntheticProperty import org.jetbrains.kotlin.fir.declarations.synthetic.FirSyntheticPropertyAccessor import org.jetbrains.kotlin.fir.isCopyCreatedInScope -internal object LLFirResolveMultiDesignationCollector { +internal object LLFirResolveDesignationCollector { fun getDesignationToResolve(target: FirElementWithResolveState): LLFirResolveTarget? { return getDesignationToResolve(target, FirDesignation::asResolveTarget) } diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractFirLazyDeclarationResolveOverAllPhasesTest.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractFirLazyDeclarationResolveOverAllPhasesTest.kt index 7ba783ff577..34bb8c0bd15 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractFirLazyDeclarationResolveOverAllPhasesTest.kt +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractFirLazyDeclarationResolveOverAllPhasesTest.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir import org.jetbrains.kotlin.analysis.low.level.api.fir.api.LLFirResolveSession -import org.jetbrains.kotlin.analysis.low.level.api.fir.lazy.resolve.LLFirResolveMultiDesignationCollector +import org.jetbrains.kotlin.analysis.low.level.api.fir.lazy.resolve.LLFirResolveDesignationCollector import org.jetbrains.kotlin.analysis.test.framework.project.structure.allKtFiles import org.jetbrains.kotlin.fir.FirElementWithResolveState import org.jetbrains.kotlin.fir.declarations.FirResolvePhase @@ -41,7 +41,7 @@ abstract class AbstractFirLazyDeclarationResolveOverAllPhasesTest : AbstractFirL testServices.allKtFiles().map(firResolveSession::getOrBuildFirFile) } else { val firFile = firResolveSession.getOrBuildFirFile(ktFile) - val designation = LLFirResolveMultiDesignationCollector.getDesignationToResolve(elementToResolve) + val designation = LLFirResolveDesignationCollector.getDesignationToResolve(elementToResolve) listOfNotNull(firFile, designation?.firFile).distinct() }