From a52262bf976e975d766c6741af432c6752cc3546 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Mon, 14 Sep 2020 11:08:45 +0300 Subject: [PATCH] FIR IDE: run completion resolve under lock --- .../low/level/api/FirModuleResolveState.kt | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/FirModuleResolveState.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/FirModuleResolveState.kt index be2d1616840..df922514fb6 100644 --- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/FirModuleResolveState.kt +++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/FirModuleResolveState.kt @@ -100,16 +100,18 @@ internal class FirModuleResolveStateImpl( toPhase: FirResolvePhase, towerDataContextCollector: FirTowerDataContextCollector ) { - firLazyDeclarationResolver.runLazyResolveWithoutLock( - firFunction, - rootModuleSession.cache, - containerFirFile, - firIdeProvider, - fromPhase = firFunction.resolvePhase, - toPhase, - towerDataContextCollector, - checkPCE = false - ) + firFileBuilder.runCustomResolveWithPCECheck(containerFirFile, rootModuleSession.cache) { + firLazyDeclarationResolver.runLazyResolveWithoutLock( + firFunction, + rootModuleSession.cache, + containerFirFile, + firIdeProvider, + fromPhase = firFunction.resolvePhase, + toPhase, + towerDataContextCollector, + checkPCE = true + ) + } } }