From 14b28ba99b954e6c5da86c1ddc2b5a9722aba4e4 Mon Sep 17 00:00:00 2001 From: Dmitrii Gridin Date: Thu, 18 May 2023 15:36:38 +0200 Subject: [PATCH] [LL FIR] drop redundant lazy resolve to imports phase Also, createTowerDataContext now uses cache ^KT-56551 --- .../level/api/fir/api/LowLevelFirApiFacadeForResolveOnAir.kt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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 986eeb7136e..8bddba5fd35 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 @@ -159,13 +159,11 @@ object LowLevelFirApiFacadeForResolveOnAir { val firFile = moduleComponents.firFileBuilder.buildRawFirFileWithCaching(file) val scopeSession = firResolveSession.getScopeSessionFor(session) - firFile.lazyResolveToPhase(FirResolvePhase.IMPORTS) - return firFile.createTowerDataContext(scopeSession) } private fun FirFile.createTowerDataContext(scopeSession: ScopeSession): FirTowerDataContext { - val importingScopes = createImportingScopes(this, moduleData.session, scopeSession, useCaching = false) + val importingScopes = createImportingScopes(this, moduleData.session, scopeSession) val fileScopeElements = importingScopes.map { it.asTowerDataElement(isLocal = false) } return FirTowerDataContext().addNonLocalTowerDataElements(fileScopeElements) }