From e6fbcb5567922e8d2f1314dc3b89c76d6d9d3d8d Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Mon, 26 Jun 2023 11:12:54 +0300 Subject: [PATCH] [FIR] Simplify utility for extracting constructor from FirAnnotation --- .../src/org/jetbrains/kotlin/fir/resolve/ResolveUtils.kt | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/ResolveUtils.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/ResolveUtils.kt index a84a25f459d..6f8d26ae94c 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/ResolveUtils.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/ResolveUtils.kt @@ -515,14 +515,7 @@ private val FirExpression.isCallToStatementLikeFunction: Boolean } fun FirAnnotation.getCorrespondingClassSymbolOrNull(session: FirSession): FirRegularClassSymbol? { - return annotationTypeRef.coneType.fullyExpandedType(session).classId?.let { - if (it.isLocal) { - // TODO: How to retrieve local annotaiton's constructor? - null - } else { - (session.symbolProvider.getClassLikeSymbolByClassId(it) as? FirRegularClassSymbol) - } - } + return annotationTypeRef.coneType.fullyExpandedType(session).toRegularClassSymbol(session) } fun BodyResolveComponents.initialTypeOfCandidate(candidate: Candidate): ConeKotlinType {