K2: use MutableOrEmptyList for nonFatalDiagnostics

This commit is contained in:
Mikhail Glukhikh
2022-12-15 10:29:41 +01:00
committed by Space Team
parent 582b640bec
commit dff71a9602
9 changed files with 25 additions and 13 deletions
@@ -56,6 +56,8 @@ abstract class FirPropertyAccessExpression : FirQualifiedAccessExpression() {
abstract override fun replaceExtensionReceiver(newExtensionReceiver: FirExpression)
abstract fun replaceNonFatalDiagnostics(newNonFatalDiagnostics: List<ConeDiagnostic>)
abstract override fun <D> transformAnnotations(transformer: FirTransformer<D>, data: D): FirPropertyAccessExpression
abstract override fun <D> transformCalleeReference(transformer: FirTransformer<D>, data: D): FirPropertyAccessExpression
@@ -51,7 +51,7 @@ class FirErrorResolvedQualifierBuilder : FirAbstractResolvedQualifierBuilder, Fi
relativeClassFqName,
symbol,
isNullableLHSForCallableReference,
nonFatalDiagnostics,
nonFatalDiagnostics.toMutableOrEmpty(),
typeArguments,
diagnostic,
)
@@ -57,7 +57,7 @@ class FirPropertyAccessExpressionBuilder : FirQualifiedAccessBuilder, FirAnnotat
explicitReceiver,
dispatchReceiver,
extensionReceiver,
nonFatalDiagnostics,
nonFatalDiagnostics.toMutableOrEmpty(),
)
}
@@ -53,7 +53,7 @@ class FirResolvedQualifierBuilder : FirAbstractResolvedQualifierBuilder, FirAnno
relativeClassFqName,
symbol,
isNullableLHSForCallableReference,
nonFatalDiagnostics,
nonFatalDiagnostics.toMutableOrEmpty(),
typeArguments,
)
}
@@ -33,7 +33,7 @@ internal class FirErrorResolvedQualifierImpl(
override val relativeClassFqName: FqName?,
override val symbol: FirClassLikeSymbol<*>?,
override var isNullableLHSForCallableReference: Boolean,
override val nonFatalDiagnostics: MutableList<ConeDiagnostic>,
override var nonFatalDiagnostics: MutableOrEmptyList<ConeDiagnostic>,
override val typeArguments: MutableList<FirTypeProjection>,
override val diagnostic: ConeDiagnostic,
) : FirErrorResolvedQualifier() {
@@ -35,7 +35,7 @@ class FirPropertyAccessExpressionImpl @FirImplementationDetail constructor(
override var explicitReceiver: FirExpression?,
override var dispatchReceiver: FirExpression,
override var extensionReceiver: FirExpression,
override val nonFatalDiagnostics: MutableList<ConeDiagnostic>,
override var nonFatalDiagnostics: MutableOrEmptyList<ConeDiagnostic>,
) : FirPropertyAccessExpression() {
override fun <R, D> acceptChildren(visitor: FirVisitor<R, D>, data: D) {
typeRef.accept(visitor, data)
@@ -126,4 +126,8 @@ class FirPropertyAccessExpressionImpl @FirImplementationDetail constructor(
override fun replaceExtensionReceiver(newExtensionReceiver: FirExpression) {
extensionReceiver = newExtensionReceiver
}
override fun replaceNonFatalDiagnostics(newNonFatalDiagnostics: List<ConeDiagnostic>) {
nonFatalDiagnostics = newNonFatalDiagnostics.toMutableOrEmpty()
}
}
@@ -34,7 +34,7 @@ internal class FirResolvedQualifierImpl(
override var relativeClassFqName: FqName?,
override val symbol: FirClassLikeSymbol<*>?,
override var isNullableLHSForCallableReference: Boolean,
override val nonFatalDiagnostics: MutableList<ConeDiagnostic>,
override var nonFatalDiagnostics: MutableOrEmptyList<ConeDiagnostic>,
override val typeArguments: MutableList<FirTypeProjection>,
) : FirResolvedQualifier() {
override val classId: ClassId? get() = relativeClassFqName?.let {