K2: use MutableOrEmptyList for type arguments
This commit is contained in:
committed by
Space Team
parent
a48610000d
commit
d20d63786b
+1
-1
@@ -40,7 +40,7 @@ class FirAnnotationBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder
|
||||
useSiteTarget,
|
||||
annotationTypeRef,
|
||||
argumentMapping,
|
||||
typeArguments,
|
||||
typeArguments.toMutableOrEmpty(),
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -50,7 +50,7 @@ class FirAnnotationCallBuilder : FirCallBuilder, FirAnnotationContainerBuilder,
|
||||
source,
|
||||
useSiteTarget,
|
||||
annotationTypeRef,
|
||||
typeArguments,
|
||||
typeArguments.toMutableOrEmpty(),
|
||||
argumentList,
|
||||
calleeReference,
|
||||
argumentMapping,
|
||||
|
||||
+1
-1
@@ -51,7 +51,7 @@ class FirCallableReferenceAccessBuilder : FirQualifiedAccessBuilder, FirAnnotati
|
||||
typeRef,
|
||||
annotations.toMutableOrEmpty(),
|
||||
contextReceiverArguments.toMutableOrEmpty(),
|
||||
typeArguments,
|
||||
typeArguments.toMutableOrEmpty(),
|
||||
explicitReceiver,
|
||||
dispatchReceiver,
|
||||
extensionReceiver,
|
||||
|
||||
+1
-1
@@ -54,7 +54,7 @@ class FirComponentCallBuilder : FirCallBuilder, FirAnnotationContainerBuilder, F
|
||||
source,
|
||||
annotations.toMutableOrEmpty(),
|
||||
contextReceiverArguments.toMutableOrEmpty(),
|
||||
typeArguments,
|
||||
typeArguments.toMutableOrEmpty(),
|
||||
dispatchReceiver,
|
||||
extensionReceiver,
|
||||
argumentList,
|
||||
|
||||
+1
-1
@@ -51,7 +51,7 @@ class FirErrorAnnotationCallBuilder : FirCallBuilder, FirAnnotationContainerBuil
|
||||
source,
|
||||
useSiteTarget,
|
||||
annotationTypeRef,
|
||||
typeArguments,
|
||||
typeArguments.toMutableOrEmpty(),
|
||||
argumentList,
|
||||
calleeReference,
|
||||
diagnostic,
|
||||
|
||||
+1
-1
@@ -52,7 +52,7 @@ class FirErrorResolvedQualifierBuilder : FirAbstractResolvedQualifierBuilder, Fi
|
||||
symbol,
|
||||
isNullableLHSForCallableReference,
|
||||
nonFatalDiagnostics.toMutableOrEmpty(),
|
||||
typeArguments,
|
||||
typeArguments.toMutableOrEmpty(),
|
||||
diagnostic,
|
||||
)
|
||||
}
|
||||
|
||||
+1
-1
@@ -56,7 +56,7 @@ open class FirFunctionCallBuilder : FirAbstractFunctionCallBuilder, FirAnnotatio
|
||||
typeRef,
|
||||
annotations.toMutableOrEmpty(),
|
||||
contextReceiverArguments.toMutableOrEmpty(),
|
||||
typeArguments,
|
||||
typeArguments.toMutableOrEmpty(),
|
||||
explicitReceiver,
|
||||
dispatchReceiver,
|
||||
extensionReceiver,
|
||||
|
||||
+1
-1
@@ -52,7 +52,7 @@ open class FirImplicitInvokeCallBuilder : FirAbstractFunctionCallBuilder, FirAnn
|
||||
source,
|
||||
annotations.toMutableOrEmpty(),
|
||||
contextReceiverArguments.toMutableOrEmpty(),
|
||||
typeArguments,
|
||||
typeArguments.toMutableOrEmpty(),
|
||||
explicitReceiver,
|
||||
dispatchReceiver,
|
||||
extensionReceiver,
|
||||
|
||||
+1
-1
@@ -54,7 +54,7 @@ open class FirIntegerLiteralOperatorCallBuilder : FirAbstractFunctionCallBuilder
|
||||
typeRef,
|
||||
annotations.toMutableOrEmpty(),
|
||||
contextReceiverArguments.toMutableOrEmpty(),
|
||||
typeArguments,
|
||||
typeArguments.toMutableOrEmpty(),
|
||||
explicitReceiver,
|
||||
argumentList,
|
||||
calleeReference,
|
||||
|
||||
+1
-1
@@ -53,7 +53,7 @@ class FirPropertyAccessExpressionBuilder : FirQualifiedAccessBuilder, FirAnnotat
|
||||
annotations.toMutableOrEmpty(),
|
||||
calleeReference,
|
||||
contextReceiverArguments.toMutableOrEmpty(),
|
||||
typeArguments,
|
||||
typeArguments.toMutableOrEmpty(),
|
||||
explicitReceiver,
|
||||
dispatchReceiver,
|
||||
extensionReceiver,
|
||||
|
||||
+1
-1
@@ -54,7 +54,7 @@ class FirResolvedQualifierBuilder : FirAbstractResolvedQualifierBuilder, FirAnno
|
||||
symbol,
|
||||
isNullableLHSForCallableReference,
|
||||
nonFatalDiagnostics.toMutableOrEmpty(),
|
||||
typeArguments,
|
||||
typeArguments.toMutableOrEmpty(),
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -48,7 +48,7 @@ class FirThisReceiverExpressionBuilder : FirQualifiedAccessBuilder, FirAnnotatio
|
||||
typeRef,
|
||||
annotations.toMutableOrEmpty(),
|
||||
contextReceiverArguments.toMutableOrEmpty(),
|
||||
typeArguments,
|
||||
typeArguments.toMutableOrEmpty(),
|
||||
calleeReference,
|
||||
isImplicit,
|
||||
)
|
||||
|
||||
+1
-1
@@ -47,7 +47,7 @@ class FirVariableAssignmentBuilder : FirQualifiedAccessBuilder, FirAnnotationCon
|
||||
calleeReference,
|
||||
annotations.toMutableOrEmpty(),
|
||||
contextReceiverArguments.toMutableOrEmpty(),
|
||||
typeArguments,
|
||||
typeArguments.toMutableOrEmpty(),
|
||||
explicitReceiver,
|
||||
dispatchReceiver,
|
||||
extensionReceiver,
|
||||
|
||||
+2
-3
@@ -30,7 +30,7 @@ internal class FirAnnotationCallImpl(
|
||||
override val source: KtSourceElement?,
|
||||
override val useSiteTarget: AnnotationUseSiteTarget?,
|
||||
override var annotationTypeRef: FirTypeRef,
|
||||
override val typeArguments: MutableList<FirTypeProjection>,
|
||||
override var typeArguments: MutableOrEmptyList<FirTypeProjection>,
|
||||
override var argumentList: FirArgumentList,
|
||||
override var calleeReference: FirReference,
|
||||
override var argumentMapping: FirAnnotationArgumentMapping,
|
||||
@@ -82,8 +82,7 @@ internal class FirAnnotationCallImpl(
|
||||
}
|
||||
|
||||
override fun replaceTypeArguments(newTypeArguments: List<FirTypeProjection>) {
|
||||
typeArguments.clear()
|
||||
typeArguments.addAll(newTypeArguments)
|
||||
typeArguments = newTypeArguments.toMutableOrEmpty()
|
||||
}
|
||||
|
||||
override fun replaceArgumentList(newArgumentList: FirArgumentList) {
|
||||
|
||||
+2
-3
@@ -27,7 +27,7 @@ internal class FirAnnotationImpl(
|
||||
override val useSiteTarget: AnnotationUseSiteTarget?,
|
||||
override var annotationTypeRef: FirTypeRef,
|
||||
override var argumentMapping: FirAnnotationArgumentMapping,
|
||||
override val typeArguments: MutableList<FirTypeProjection>,
|
||||
override var typeArguments: MutableOrEmptyList<FirTypeProjection>,
|
||||
) : FirAnnotation() {
|
||||
override val typeRef: FirTypeRef get() = annotationTypeRef
|
||||
override val annotations: List<FirAnnotation> get() = emptyList()
|
||||
@@ -72,7 +72,6 @@ internal class FirAnnotationImpl(
|
||||
}
|
||||
|
||||
override fun replaceTypeArguments(newTypeArguments: List<FirTypeProjection>) {
|
||||
typeArguments.clear()
|
||||
typeArguments.addAll(newTypeArguments)
|
||||
typeArguments = newTypeArguments.toMutableOrEmpty()
|
||||
}
|
||||
}
|
||||
|
||||
+2
-3
@@ -30,7 +30,7 @@ internal class FirCallableReferenceAccessImpl(
|
||||
override var typeRef: FirTypeRef,
|
||||
override var annotations: MutableOrEmptyList<FirAnnotation>,
|
||||
override var contextReceiverArguments: MutableOrEmptyList<FirExpression>,
|
||||
override val typeArguments: MutableList<FirTypeProjection>,
|
||||
override var typeArguments: MutableOrEmptyList<FirTypeProjection>,
|
||||
override var explicitReceiver: FirExpression?,
|
||||
override var dispatchReceiver: FirExpression,
|
||||
override var extensionReceiver: FirExpression,
|
||||
@@ -106,8 +106,7 @@ internal class FirCallableReferenceAccessImpl(
|
||||
}
|
||||
|
||||
override fun replaceTypeArguments(newTypeArguments: List<FirTypeProjection>) {
|
||||
typeArguments.clear()
|
||||
typeArguments.addAll(newTypeArguments)
|
||||
typeArguments = newTypeArguments.toMutableOrEmpty()
|
||||
}
|
||||
|
||||
override fun replaceExplicitReceiver(newExplicitReceiver: FirExpression?) {
|
||||
|
||||
+2
-3
@@ -35,7 +35,7 @@ internal class FirComponentCallImpl(
|
||||
override var source: KtSourceElement?,
|
||||
override var annotations: MutableOrEmptyList<FirAnnotation>,
|
||||
override var contextReceiverArguments: MutableOrEmptyList<FirExpression>,
|
||||
override val typeArguments: MutableList<FirTypeProjection>,
|
||||
override var typeArguments: MutableOrEmptyList<FirTypeProjection>,
|
||||
override var dispatchReceiver: FirExpression,
|
||||
override var extensionReceiver: FirExpression,
|
||||
override var argumentList: FirArgumentList,
|
||||
@@ -117,8 +117,7 @@ internal class FirComponentCallImpl(
|
||||
}
|
||||
|
||||
override fun replaceTypeArguments(newTypeArguments: List<FirTypeProjection>) {
|
||||
typeArguments.clear()
|
||||
typeArguments.addAll(newTypeArguments)
|
||||
typeArguments = newTypeArguments.toMutableOrEmpty()
|
||||
}
|
||||
|
||||
override fun replaceDispatchReceiver(newDispatchReceiver: FirExpression) {
|
||||
|
||||
+2
-3
@@ -31,7 +31,7 @@ internal class FirErrorAnnotationCallImpl(
|
||||
override val source: KtSourceElement?,
|
||||
override val useSiteTarget: AnnotationUseSiteTarget?,
|
||||
override var annotationTypeRef: FirTypeRef,
|
||||
override val typeArguments: MutableList<FirTypeProjection>,
|
||||
override var typeArguments: MutableOrEmptyList<FirTypeProjection>,
|
||||
override var argumentList: FirArgumentList,
|
||||
override var calleeReference: FirReference,
|
||||
override val diagnostic: ConeDiagnostic,
|
||||
@@ -84,8 +84,7 @@ internal class FirErrorAnnotationCallImpl(
|
||||
}
|
||||
|
||||
override fun replaceTypeArguments(newTypeArguments: List<FirTypeProjection>) {
|
||||
typeArguments.clear()
|
||||
typeArguments.addAll(newTypeArguments)
|
||||
typeArguments = newTypeArguments.toMutableOrEmpty()
|
||||
}
|
||||
|
||||
override fun replaceArgumentList(newArgumentList: FirArgumentList) {
|
||||
|
||||
+2
-3
@@ -34,7 +34,7 @@ internal class FirErrorResolvedQualifierImpl(
|
||||
override val symbol: FirClassLikeSymbol<*>?,
|
||||
override var isNullableLHSForCallableReference: Boolean,
|
||||
override var nonFatalDiagnostics: MutableOrEmptyList<ConeDiagnostic>,
|
||||
override val typeArguments: MutableList<FirTypeProjection>,
|
||||
override var typeArguments: MutableOrEmptyList<FirTypeProjection>,
|
||||
override val diagnostic: ConeDiagnostic,
|
||||
) : FirErrorResolvedQualifier() {
|
||||
override var typeRef: FirTypeRef = FirImplicitTypeRefImpl(null)
|
||||
@@ -81,7 +81,6 @@ internal class FirErrorResolvedQualifierImpl(
|
||||
override fun replaceResolvedToCompanionObject(newResolvedToCompanionObject: Boolean) {}
|
||||
|
||||
override fun replaceTypeArguments(newTypeArguments: List<FirTypeProjection>) {
|
||||
typeArguments.clear()
|
||||
typeArguments.addAll(newTypeArguments)
|
||||
typeArguments = newTypeArguments.toMutableOrEmpty()
|
||||
}
|
||||
}
|
||||
|
||||
+2
-3
@@ -32,7 +32,7 @@ open class FirFunctionCallImpl @FirImplementationDetail constructor(
|
||||
override var typeRef: FirTypeRef,
|
||||
override var annotations: MutableOrEmptyList<FirAnnotation>,
|
||||
override var contextReceiverArguments: MutableOrEmptyList<FirExpression>,
|
||||
override val typeArguments: MutableList<FirTypeProjection>,
|
||||
override var typeArguments: MutableOrEmptyList<FirTypeProjection>,
|
||||
override var explicitReceiver: FirExpression?,
|
||||
override var dispatchReceiver: FirExpression,
|
||||
override var extensionReceiver: FirExpression,
|
||||
@@ -111,8 +111,7 @@ open class FirFunctionCallImpl @FirImplementationDetail constructor(
|
||||
}
|
||||
|
||||
override fun replaceTypeArguments(newTypeArguments: List<FirTypeProjection>) {
|
||||
typeArguments.clear()
|
||||
typeArguments.addAll(newTypeArguments)
|
||||
typeArguments = newTypeArguments.toMutableOrEmpty()
|
||||
}
|
||||
|
||||
override fun replaceExplicitReceiver(newExplicitReceiver: FirExpression?) {
|
||||
|
||||
+2
-3
@@ -32,7 +32,7 @@ internal class FirImplicitInvokeCallImpl(
|
||||
override var source: KtSourceElement?,
|
||||
override var annotations: MutableOrEmptyList<FirAnnotation>,
|
||||
override var contextReceiverArguments: MutableOrEmptyList<FirExpression>,
|
||||
override val typeArguments: MutableList<FirTypeProjection>,
|
||||
override var typeArguments: MutableOrEmptyList<FirTypeProjection>,
|
||||
override var explicitReceiver: FirExpression?,
|
||||
override var dispatchReceiver: FirExpression,
|
||||
override var extensionReceiver: FirExpression,
|
||||
@@ -113,8 +113,7 @@ internal class FirImplicitInvokeCallImpl(
|
||||
}
|
||||
|
||||
override fun replaceTypeArguments(newTypeArguments: List<FirTypeProjection>) {
|
||||
typeArguments.clear()
|
||||
typeArguments.addAll(newTypeArguments)
|
||||
typeArguments = newTypeArguments.toMutableOrEmpty()
|
||||
}
|
||||
|
||||
override fun replaceExplicitReceiver(newExplicitReceiver: FirExpression?) {
|
||||
|
||||
+2
-3
@@ -32,7 +32,7 @@ internal class FirIntegerLiteralOperatorCallImpl(
|
||||
override var typeRef: FirTypeRef,
|
||||
override var annotations: MutableOrEmptyList<FirAnnotation>,
|
||||
override var contextReceiverArguments: MutableOrEmptyList<FirExpression>,
|
||||
override val typeArguments: MutableList<FirTypeProjection>,
|
||||
override var typeArguments: MutableOrEmptyList<FirTypeProjection>,
|
||||
override var explicitReceiver: FirExpression?,
|
||||
override var argumentList: FirArgumentList,
|
||||
override var calleeReference: FirNamedReference,
|
||||
@@ -121,8 +121,7 @@ internal class FirIntegerLiteralOperatorCallImpl(
|
||||
}
|
||||
|
||||
override fun replaceTypeArguments(newTypeArguments: List<FirTypeProjection>) {
|
||||
typeArguments.clear()
|
||||
typeArguments.addAll(newTypeArguments)
|
||||
typeArguments = newTypeArguments.toMutableOrEmpty()
|
||||
}
|
||||
|
||||
override fun replaceExplicitReceiver(newExplicitReceiver: FirExpression?) {
|
||||
|
||||
+2
-3
@@ -31,7 +31,7 @@ class FirPropertyAccessExpressionImpl @FirImplementationDetail constructor(
|
||||
override var annotations: MutableOrEmptyList<FirAnnotation>,
|
||||
override var calleeReference: FirReference,
|
||||
override var contextReceiverArguments: MutableOrEmptyList<FirExpression>,
|
||||
override val typeArguments: MutableList<FirTypeProjection>,
|
||||
override var typeArguments: MutableOrEmptyList<FirTypeProjection>,
|
||||
override var explicitReceiver: FirExpression?,
|
||||
override var dispatchReceiver: FirExpression,
|
||||
override var extensionReceiver: FirExpression,
|
||||
@@ -110,8 +110,7 @@ class FirPropertyAccessExpressionImpl @FirImplementationDetail constructor(
|
||||
}
|
||||
|
||||
override fun replaceTypeArguments(newTypeArguments: List<FirTypeProjection>) {
|
||||
typeArguments.clear()
|
||||
typeArguments.addAll(newTypeArguments)
|
||||
typeArguments = newTypeArguments.toMutableOrEmpty()
|
||||
}
|
||||
|
||||
override fun replaceExplicitReceiver(newExplicitReceiver: FirExpression?) {
|
||||
|
||||
+2
-3
@@ -35,7 +35,7 @@ internal class FirResolvedQualifierImpl(
|
||||
override val symbol: FirClassLikeSymbol<*>?,
|
||||
override var isNullableLHSForCallableReference: Boolean,
|
||||
override var nonFatalDiagnostics: MutableOrEmptyList<ConeDiagnostic>,
|
||||
override val typeArguments: MutableList<FirTypeProjection>,
|
||||
override var typeArguments: MutableOrEmptyList<FirTypeProjection>,
|
||||
) : FirResolvedQualifier() {
|
||||
override val classId: ClassId? get() = relativeClassFqName?.let {
|
||||
ClassId(packageFqName, it, false)
|
||||
@@ -82,7 +82,6 @@ internal class FirResolvedQualifierImpl(
|
||||
}
|
||||
|
||||
override fun replaceTypeArguments(newTypeArguments: List<FirTypeProjection>) {
|
||||
typeArguments.clear()
|
||||
typeArguments.addAll(newTypeArguments)
|
||||
typeArguments = newTypeArguments.toMutableOrEmpty()
|
||||
}
|
||||
}
|
||||
|
||||
+2
-3
@@ -31,7 +31,7 @@ internal class FirThisReceiverExpressionImpl(
|
||||
override var typeRef: FirTypeRef,
|
||||
override var annotations: MutableOrEmptyList<FirAnnotation>,
|
||||
override var contextReceiverArguments: MutableOrEmptyList<FirExpression>,
|
||||
override val typeArguments: MutableList<FirTypeProjection>,
|
||||
override var typeArguments: MutableOrEmptyList<FirTypeProjection>,
|
||||
override var calleeReference: FirThisReference,
|
||||
override val isImplicit: Boolean,
|
||||
) : FirThisReceiverExpression() {
|
||||
@@ -108,8 +108,7 @@ internal class FirThisReceiverExpressionImpl(
|
||||
}
|
||||
|
||||
override fun replaceTypeArguments(newTypeArguments: List<FirTypeProjection>) {
|
||||
typeArguments.clear()
|
||||
typeArguments.addAll(newTypeArguments)
|
||||
typeArguments = newTypeArguments.toMutableOrEmpty()
|
||||
}
|
||||
|
||||
override fun replaceExplicitReceiver(newExplicitReceiver: FirExpression?) {
|
||||
|
||||
+2
-3
@@ -29,7 +29,7 @@ internal class FirVariableAssignmentImpl(
|
||||
override var calleeReference: FirReference,
|
||||
override var annotations: MutableOrEmptyList<FirAnnotation>,
|
||||
override var contextReceiverArguments: MutableOrEmptyList<FirExpression>,
|
||||
override val typeArguments: MutableList<FirTypeProjection>,
|
||||
override var typeArguments: MutableOrEmptyList<FirTypeProjection>,
|
||||
override var explicitReceiver: FirExpression?,
|
||||
override var dispatchReceiver: FirExpression,
|
||||
override var extensionReceiver: FirExpression,
|
||||
@@ -114,8 +114,7 @@ internal class FirVariableAssignmentImpl(
|
||||
}
|
||||
|
||||
override fun replaceTypeArguments(newTypeArguments: List<FirTypeProjection>) {
|
||||
typeArguments.clear()
|
||||
typeArguments.addAll(newTypeArguments)
|
||||
typeArguments = newTypeArguments.toMutableOrEmpty()
|
||||
}
|
||||
|
||||
override fun replaceExplicitReceiver(newExplicitReceiver: FirExpression?) {
|
||||
|
||||
+1
-1
@@ -31,7 +31,7 @@ object FieldSets {
|
||||
)
|
||||
}
|
||||
|
||||
val typeArguments by lazy { fieldList("typeArguments", typeProjection, withReplace = true) }
|
||||
val typeArguments by lazy { fieldList("typeArguments", typeProjection, useMutableOrEmpty = true, withReplace = true) }
|
||||
|
||||
val arguments by lazy { fieldList("arguments", expression) }
|
||||
|
||||
|
||||
Reference in New Issue
Block a user