[FIR] Pass annotations to buildResolvedQualifierForClass

This commit is contained in:
Ivan Kochurkin
2022-06-04 21:56:35 +03:00
committed by teamcity
parent 1ac4d68433
commit c5648fd449
4 changed files with 17 additions and 4 deletions
@@ -362,7 +362,8 @@ class FirCallResolver(
qualifiedAccess.explicitReceiver,
referencedSymbol,
nonFatalDiagnosticFromExpression,
)
),
annotations = qualifiedAccess.annotations
)
}
referencedSymbol is FirTypeParameterSymbol && referencedSymbol.fir.isReified -> {
@@ -146,7 +146,8 @@ fun BodyResolveComponents.buildResolvedQualifierForClass(
// TODO: Clarify if we actually need type arguments for qualifier?
typeArgumentsForQualifier: List<FirTypeProjection> = emptyList(),
diagnostic: ConeDiagnostic? = null,
nonFatalDiagnostics: List<ConeDiagnostic> = emptyList()
nonFatalDiagnostics: List<ConeDiagnostic> = emptyList(),
annotations: List<FirAnnotation> = emptyList()
): FirResolvedQualifier {
val classId = regularClass.classId
@@ -163,6 +164,7 @@ fun BodyResolveComponents.buildResolvedQualifierForClass(
typeArguments.addAll(typeArgumentsForQualifier)
symbol = regularClass
this.nonFatalDiagnostics.addAll(nonFatalDiagnostics)
this.annotations.addAll(annotations)
}.build().apply {
resultType = if (classId.isLocal) {
typeForQualifierByDeclaration(regularClass.fir, resultType, session)