From 4b580b4e06bd1c8d175c592c489114c8a00c68f7 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Tue, 28 Apr 2020 10:36:58 +0300 Subject: [PATCH] [FIR] Refactor `FirResolvePhase.requiredToLaunch` --- .../kotlin/fir/declarations/FirResolvePhase.kt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirResolvePhase.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirResolvePhase.kt index eca57882cea..3c24819924e 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirResolvePhase.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirResolvePhase.kt @@ -5,8 +5,6 @@ package org.jetbrains.kotlin.fir.declarations -import java.util.* - enum class FirResolvePhase { RAW_FIR, IMPORTS, @@ -18,7 +16,12 @@ enum class FirResolvePhase { IMPLICIT_TYPES_BODY_RESOLVE, BODY_RESOLVE; - val requiredToLaunch: FirResolvePhase get() = if (this in bodyResolvePhases) STATUS else values()[ordinal - 1] + val requiredToLaunch: FirResolvePhase + get() = when (this) { + RAW_FIR -> RAW_FIR + IMPLICIT_TYPES_BODY_RESOLVE, BODY_RESOLVE -> STATUS + else -> values()[ordinal - 1] + } val next: FirResolvePhase get() = values()[ordinal + 1] @@ -26,7 +29,5 @@ enum class FirResolvePhase { // Short-cut val DECLARATIONS = STATUS val ANALYZED_DEPENDENCIES = BODY_RESOLVE - - private val bodyResolvePhases = EnumSet.copyOf(setOf(IMPLICIT_TYPES_BODY_RESOLVE, BODY_RESOLVE)) } }