From 66de893963809f0ef14b1fbca598621765c782bc Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Tue, 2 May 2023 17:33:00 +0200 Subject: [PATCH] [LL FIR] refactoring: rename LowLevelFirApiFacadeForResolveOnAir.onAirGetTowerContextProvider -> getOnAirGetTowerContextProvider so it matches its counterpart getOnAirTowerDataContextProviderForTheWholeFile --- .../analysis/api/fir/components/KtFirReferenceShortener.kt | 2 +- .../level/api/fir/api/LowLevelFirApiFacadeForResolveOnAir.kt | 2 +- .../level/api/fir/state/TowerProviderForElementForState.kt | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirReferenceShortener.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirReferenceShortener.kt index f6d23c59dae..725608197ed 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirReferenceShortener.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirReferenceShortener.kt @@ -90,7 +90,7 @@ internal class KtFirReferenceShortener( LowLevelFirApiFacadeForResolveOnAir.getOnAirTowerDataContextProviderForTheWholeFile(firResolveSession, declarationToVisit) } else -> { - LowLevelFirApiFacadeForResolveOnAir.onAirGetTowerContextProvider(firResolveSession, declarationToVisit) + LowLevelFirApiFacadeForResolveOnAir.getOnAirGetTowerContextProvider(firResolveSession, declarationToVisit) } } //TODO: collect all usages of available symbols in the file and prevent importing symbols that could introduce name clashes, which diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/LowLevelFirApiFacadeForResolveOnAir.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/LowLevelFirApiFacadeForResolveOnAir.kt index 9e3e87a4bed..c21ac4dfd6e 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/LowLevelFirApiFacadeForResolveOnAir.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/LowLevelFirApiFacadeForResolveOnAir.kt @@ -125,7 +125,7 @@ object LowLevelFirApiFacadeForResolveOnAir { return collector } - fun onAirGetTowerContextProvider( + fun getOnAirGetTowerContextProvider( firResolveSession: LLFirResolveSession, place: KtElement, ): FirTowerContextProvider { diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/state/TowerProviderForElementForState.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/state/TowerProviderForElementForState.kt index 8814d61f31c..9724f79599b 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/state/TowerProviderForElementForState.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/state/TowerProviderForElementForState.kt @@ -20,11 +20,11 @@ internal class TowerProviderForElementForState(private val firResolveSession: LL ?.let { return it } return LowLevelFirApiFacadeForResolveOnAir - .onAirGetTowerContextProvider(firResolveSession.originalFirResolveSession, ktElement) + .getOnAirGetTowerContextProvider(firResolveSession.originalFirResolveSession, ktElement) .getClosestAvailableParentContext(ktElement) } return LowLevelFirApiFacadeForResolveOnAir - .onAirGetTowerContextProvider(firResolveSession, ktElement) + .getOnAirGetTowerContextProvider(firResolveSession, ktElement) .getClosestAvailableParentContext(ktElement) } } \ No newline at end of file