From 3505b285f71d1858b3a120368cbf99f7d3e96d2c Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Tue, 1 Mar 2022 11:10:47 +0300 Subject: [PATCH] FirLazyDeclarationResolver: drop skipPhaseInLazyResolve --- .../api/fir/lazy/resolve/FirLazyDeclarationResolver.kt | 7 ------- 1 file changed, 7 deletions(-) diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/FirLazyDeclarationResolver.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/FirLazyDeclarationResolver.kt index c3e90a3a3dc..90aa6da0350 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/FirLazyDeclarationResolver.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/FirLazyDeclarationResolver.kt @@ -174,7 +174,6 @@ internal class FirLazyDeclarationResolver(private val firFileBuilder: FirFileBui var currentPhase = FirResolvePhase.IMPORTS while (currentPhase < toPhase) { currentPhase = currentPhase.next - if (skipPhaseInLazyResolve(currentPhase)) continue if (checkPCE) checkCanceled() val transformersToApply = designations.mapNotNull { @@ -358,7 +357,6 @@ internal class FirLazyDeclarationResolver(private val firFileBuilder: FirFileBui while (currentPhase < toPhase) { currentPhase = currentPhase.next - if (skipPhaseInLazyResolve(currentPhase)) continue if (checkPCE) checkCanceled() LazyTransformerFactory.createLazyTransformer( @@ -396,7 +394,6 @@ internal class FirLazyDeclarationResolver(private val firFileBuilder: FirFileBui while (currentPhase < FirResolvePhase.BODY_RESOLVE) { currentPhase = currentPhase.next - if (skipPhaseInLazyResolve(currentPhase)) continue if (checkPCE) checkCanceled() LazyTransformerFactory.createLazyTransformer( @@ -411,10 +408,6 @@ internal class FirLazyDeclarationResolver(private val firFileBuilder: FirFileBui ).transformDeclaration(firFileBuilder.firPhaseRunner) } } - - private fun skipPhaseInLazyResolve(currentPhase: FirResolvePhase): Boolean { - return currentPhase == FirResolvePhase.COMPILER_REQUIRED_ANNOTATIONS - } } private fun KtDeclaration.getContainingEnumEntryAsMemberOfEnumEntry(): KtEnumEntry? {