From 379ec2fae806a37b7a5242a7b5e9bf370ed59da4 Mon Sep 17 00:00:00 2001 From: "Denis.Zharkov" Date: Mon, 26 Jun 2023 15:09:46 +0300 Subject: [PATCH] K2: Get rid of redundant enum at FirOptInUsageBaseChecker --- .../expression/FirOptInUsageBaseChecker.kt | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirOptInUsageBaseChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirOptInUsageBaseChecker.kt index 08a45801a62..7c71753a1db 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirOptInUsageBaseChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirOptInUsageBaseChecker.kt @@ -23,7 +23,10 @@ import org.jetbrains.kotlin.fir.resolve.toFirRegularClassSymbol import org.jetbrains.kotlin.fir.resolve.toSymbol import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.SymbolInternals -import org.jetbrains.kotlin.fir.symbols.impl.* +import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol +import org.jetbrains.kotlin.fir.symbols.impl.FirClassLikeSymbol +import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol +import org.jetbrains.kotlin.fir.symbols.impl.FirRegularClassSymbol import org.jetbrains.kotlin.fir.symbols.lazyResolveToPhase import org.jetbrains.kotlin.fir.types.* import org.jetbrains.kotlin.name.ClassId @@ -255,9 +258,9 @@ object FirOptInUsageBaseChecker { val levelArgument = experimental.findArgumentByName(LEVEL) as? FirQualifiedAccessExpression val levelName = levelArgument?.calleeReference?.resolved?.name?.asString() - val level = OptInLevel.values().firstOrNull { it.name == levelName } ?: OptInLevel.DEFAULT + val severity = Experimentality.Severity.values().firstOrNull { it.name == levelName } ?: Experimentality.DEFAULT_SEVERITY val message = (experimental.findArgumentByName(MESSAGE) as? FirConstExpression<*>)?.value as? String - return Experimentality(symbol.classId, level.severity, message, annotatedOwnerClassName) + return Experimentality(symbol.classId, severity, message, annotatedOwnerClassName) } fun reportNotAcceptedExperimentalities( @@ -381,10 +384,4 @@ object FirOptInUsageBaseChecker { private val LEVEL = Name.identifier("level") private val MESSAGE = Name.identifier("message") - - private enum class OptInLevel(val severity: Experimentality.Severity) { - WARNING(Experimentality.Severity.WARNING), - ERROR(Experimentality.Severity.ERROR), - DEFAULT(Experimentality.DEFAULT_SEVERITY) - } }