From ddc786364fb44b73db4a18bcfdd30a229f1f0568 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Thu, 15 Dec 2022 10:43:57 +0100 Subject: [PATCH] K2: use MutableOrEmptyList for context receivers --- .../expressions/builder/FirCallableReferenceAccessBuilder.kt | 2 +- .../fir/expressions/builder/FirComponentCallBuilder.kt | 2 +- .../builder/FirDelegatedConstructorCallBuilder.kt | 2 +- .../kotlin/fir/expressions/builder/FirFunctionCallBuilder.kt | 2 +- .../fir/expressions/builder/FirImplicitInvokeCallBuilder.kt | 2 +- .../builder/FirIntegerLiteralOperatorCallBuilder.kt | 2 +- .../builder/FirPropertyAccessExpressionBuilder.kt | 2 +- .../expressions/builder/FirThisReceiverExpressionBuilder.kt | 2 +- .../fir/expressions/builder/FirVariableAssignmentBuilder.kt | 2 +- .../fir/expressions/impl/FirCallableReferenceAccessImpl.kt | 5 ++--- .../kotlin/fir/expressions/impl/FirComponentCallImpl.kt | 5 ++--- .../fir/expressions/impl/FirDelegatedConstructorCallImpl.kt | 5 ++--- .../kotlin/fir/expressions/impl/FirFunctionCallImpl.kt | 5 ++--- .../kotlin/fir/expressions/impl/FirImplicitInvokeCallImpl.kt | 5 ++--- .../expressions/impl/FirIntegerLiteralOperatorCallImpl.kt | 5 ++--- .../fir/expressions/impl/FirPropertyAccessExpressionImpl.kt | 5 ++--- .../fir/expressions/impl/FirThisReceiverExpressionImpl.kt | 5 ++--- .../kotlin/fir/expressions/impl/FirVariableAssignmentImpl.kt | 5 ++--- .../org/jetbrains/kotlin/fir/visitors/FirTransformerUtil.kt | 3 +-- .../jetbrains/kotlin/fir/tree/generator/NodeConfigurator.kt | 2 +- 20 files changed, 29 insertions(+), 39 deletions(-) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCallableReferenceAccessBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCallableReferenceAccessBuilder.kt index c4082a0de4c..ce871685348 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCallableReferenceAccessBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCallableReferenceAccessBuilder.kt @@ -50,7 +50,7 @@ class FirCallableReferenceAccessBuilder : FirQualifiedAccessBuilder, FirAnnotati source, typeRef, annotations.toMutableOrEmpty(), - contextReceiverArguments, + contextReceiverArguments.toMutableOrEmpty(), typeArguments, explicitReceiver, dispatchReceiver, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirComponentCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirComponentCallBuilder.kt index bb29399ffcb..55fb82806a7 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirComponentCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirComponentCallBuilder.kt @@ -53,7 +53,7 @@ class FirComponentCallBuilder : FirCallBuilder, FirAnnotationContainerBuilder, F return FirComponentCallImpl( source, annotations.toMutableOrEmpty(), - contextReceiverArguments, + contextReceiverArguments.toMutableOrEmpty(), typeArguments, dispatchReceiver, extensionReceiver, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirDelegatedConstructorCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirDelegatedConstructorCallBuilder.kt index 15037eb221f..030f97c67f5 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirDelegatedConstructorCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirDelegatedConstructorCallBuilder.kt @@ -47,7 +47,7 @@ class FirDelegatedConstructorCallBuilder : FirCallBuilder, FirAnnotationContaine source, annotations.toMutableOrEmpty(), argumentList, - contextReceiverArguments, + contextReceiverArguments.toMutableOrEmpty(), constructedTypeRef, dispatchReceiver, calleeReference, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirFunctionCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirFunctionCallBuilder.kt index 510557291d5..480b794ae65 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirFunctionCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirFunctionCallBuilder.kt @@ -55,7 +55,7 @@ open class FirFunctionCallBuilder : FirAbstractFunctionCallBuilder, FirAnnotatio source, typeRef, annotations.toMutableOrEmpty(), - contextReceiverArguments, + contextReceiverArguments.toMutableOrEmpty(), typeArguments, explicitReceiver, dispatchReceiver, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirImplicitInvokeCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirImplicitInvokeCallBuilder.kt index f498258610e..2b4807fd763 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirImplicitInvokeCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirImplicitInvokeCallBuilder.kt @@ -51,7 +51,7 @@ open class FirImplicitInvokeCallBuilder : FirAbstractFunctionCallBuilder, FirAnn return FirImplicitInvokeCallImpl( source, annotations.toMutableOrEmpty(), - contextReceiverArguments, + contextReceiverArguments.toMutableOrEmpty(), typeArguments, explicitReceiver, dispatchReceiver, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirIntegerLiteralOperatorCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirIntegerLiteralOperatorCallBuilder.kt index e75db3f08b0..2c2f656ae1e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirIntegerLiteralOperatorCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirIntegerLiteralOperatorCallBuilder.kt @@ -53,7 +53,7 @@ open class FirIntegerLiteralOperatorCallBuilder : FirAbstractFunctionCallBuilder source, typeRef, annotations.toMutableOrEmpty(), - contextReceiverArguments, + contextReceiverArguments.toMutableOrEmpty(), typeArguments, explicitReceiver, argumentList, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirPropertyAccessExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirPropertyAccessExpressionBuilder.kt index 786ab1d4f65..907b463d82f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirPropertyAccessExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirPropertyAccessExpressionBuilder.kt @@ -52,7 +52,7 @@ class FirPropertyAccessExpressionBuilder : FirQualifiedAccessBuilder, FirAnnotat typeRef, annotations.toMutableOrEmpty(), calleeReference, - contextReceiverArguments, + contextReceiverArguments.toMutableOrEmpty(), typeArguments, explicitReceiver, dispatchReceiver, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirThisReceiverExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirThisReceiverExpressionBuilder.kt index f8b2f6f0cb4..041f0a4134b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirThisReceiverExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirThisReceiverExpressionBuilder.kt @@ -47,7 +47,7 @@ class FirThisReceiverExpressionBuilder : FirQualifiedAccessBuilder, FirAnnotatio source, typeRef, annotations.toMutableOrEmpty(), - contextReceiverArguments, + contextReceiverArguments.toMutableOrEmpty(), typeArguments, calleeReference, isImplicit, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirVariableAssignmentBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirVariableAssignmentBuilder.kt index 6b37b3e2dde..7da72f0d4ab 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirVariableAssignmentBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirVariableAssignmentBuilder.kt @@ -46,7 +46,7 @@ class FirVariableAssignmentBuilder : FirQualifiedAccessBuilder, FirAnnotationCon return FirVariableAssignmentImpl( calleeReference, annotations.toMutableOrEmpty(), - contextReceiverArguments, + contextReceiverArguments.toMutableOrEmpty(), typeArguments, explicitReceiver, dispatchReceiver, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCallableReferenceAccessImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCallableReferenceAccessImpl.kt index 6dfaf83d239..275488c5b02 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCallableReferenceAccessImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCallableReferenceAccessImpl.kt @@ -29,7 +29,7 @@ internal class FirCallableReferenceAccessImpl( override var source: KtSourceElement?, override var typeRef: FirTypeRef, override var annotations: MutableOrEmptyList, - override val contextReceiverArguments: MutableList, + override var contextReceiverArguments: MutableOrEmptyList, override val typeArguments: MutableList, override var explicitReceiver: FirExpression?, override var dispatchReceiver: FirExpression, @@ -102,8 +102,7 @@ internal class FirCallableReferenceAccessImpl( } override fun replaceContextReceiverArguments(newContextReceiverArguments: List) { - contextReceiverArguments.clear() - contextReceiverArguments.addAll(newContextReceiverArguments) + contextReceiverArguments = newContextReceiverArguments.toMutableOrEmpty() } override fun replaceTypeArguments(newTypeArguments: List) { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirComponentCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirComponentCallImpl.kt index 49994b2b3ea..694db9d1d0c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirComponentCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirComponentCallImpl.kt @@ -34,7 +34,7 @@ import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty internal class FirComponentCallImpl( override var source: KtSourceElement?, override var annotations: MutableOrEmptyList, - override val contextReceiverArguments: MutableList, + override var contextReceiverArguments: MutableOrEmptyList, override val typeArguments: MutableList, override var dispatchReceiver: FirExpression, override var extensionReceiver: FirExpression, @@ -113,8 +113,7 @@ internal class FirComponentCallImpl( } override fun replaceContextReceiverArguments(newContextReceiverArguments: List) { - contextReceiverArguments.clear() - contextReceiverArguments.addAll(newContextReceiverArguments) + contextReceiverArguments = newContextReceiverArguments.toMutableOrEmpty() } override fun replaceTypeArguments(newTypeArguments: List) { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirDelegatedConstructorCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirDelegatedConstructorCallImpl.kt index dc92ef40123..5bc597ddad5 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirDelegatedConstructorCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirDelegatedConstructorCallImpl.kt @@ -29,7 +29,7 @@ internal class FirDelegatedConstructorCallImpl( override val source: KtSourceElement?, override var annotations: MutableOrEmptyList, override var argumentList: FirArgumentList, - override val contextReceiverArguments: MutableList, + override var contextReceiverArguments: MutableOrEmptyList, override var constructedTypeRef: FirTypeRef, override var dispatchReceiver: FirExpression, override var calleeReference: FirReference, @@ -78,8 +78,7 @@ internal class FirDelegatedConstructorCallImpl( } override fun replaceContextReceiverArguments(newContextReceiverArguments: List) { - contextReceiverArguments.clear() - contextReceiverArguments.addAll(newContextReceiverArguments) + contextReceiverArguments = newContextReceiverArguments.toMutableOrEmpty() } override fun replaceConstructedTypeRef(newConstructedTypeRef: FirTypeRef) { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirFunctionCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirFunctionCallImpl.kt index 7471ec8a6ab..d9e27d81108 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirFunctionCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirFunctionCallImpl.kt @@ -31,7 +31,7 @@ open class FirFunctionCallImpl @FirImplementationDetail constructor( override var source: KtSourceElement?, override var typeRef: FirTypeRef, override var annotations: MutableOrEmptyList, - override val contextReceiverArguments: MutableList, + override var contextReceiverArguments: MutableOrEmptyList, override val typeArguments: MutableList, override var explicitReceiver: FirExpression?, override var dispatchReceiver: FirExpression, @@ -107,8 +107,7 @@ open class FirFunctionCallImpl @FirImplementationDetail constructor( } override fun replaceContextReceiverArguments(newContextReceiverArguments: List) { - contextReceiverArguments.clear() - contextReceiverArguments.addAll(newContextReceiverArguments) + contextReceiverArguments = newContextReceiverArguments.toMutableOrEmpty() } override fun replaceTypeArguments(newTypeArguments: List) { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirImplicitInvokeCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirImplicitInvokeCallImpl.kt index 0874c20f534..6051663a6c8 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirImplicitInvokeCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirImplicitInvokeCallImpl.kt @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail internal class FirImplicitInvokeCallImpl( override var source: KtSourceElement?, override var annotations: MutableOrEmptyList, - override val contextReceiverArguments: MutableList, + override var contextReceiverArguments: MutableOrEmptyList, override val typeArguments: MutableList, override var explicitReceiver: FirExpression?, override var dispatchReceiver: FirExpression, @@ -109,8 +109,7 @@ internal class FirImplicitInvokeCallImpl( } override fun replaceContextReceiverArguments(newContextReceiverArguments: List) { - contextReceiverArguments.clear() - contextReceiverArguments.addAll(newContextReceiverArguments) + contextReceiverArguments = newContextReceiverArguments.toMutableOrEmpty() } override fun replaceTypeArguments(newTypeArguments: List) { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirIntegerLiteralOperatorCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirIntegerLiteralOperatorCallImpl.kt index 8eaa2758a1d..20c6e2d2e32 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirIntegerLiteralOperatorCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirIntegerLiteralOperatorCallImpl.kt @@ -31,7 +31,7 @@ internal class FirIntegerLiteralOperatorCallImpl( override var source: KtSourceElement?, override var typeRef: FirTypeRef, override var annotations: MutableOrEmptyList, - override val contextReceiverArguments: MutableList, + override var contextReceiverArguments: MutableOrEmptyList, override val typeArguments: MutableList, override var explicitReceiver: FirExpression?, override var argumentList: FirArgumentList, @@ -117,8 +117,7 @@ internal class FirIntegerLiteralOperatorCallImpl( } override fun replaceContextReceiverArguments(newContextReceiverArguments: List) { - contextReceiverArguments.clear() - contextReceiverArguments.addAll(newContextReceiverArguments) + contextReceiverArguments = newContextReceiverArguments.toMutableOrEmpty() } override fun replaceTypeArguments(newTypeArguments: List) { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirPropertyAccessExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirPropertyAccessExpressionImpl.kt index 5ac08f3c36a..94d02a9f984 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirPropertyAccessExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirPropertyAccessExpressionImpl.kt @@ -30,7 +30,7 @@ class FirPropertyAccessExpressionImpl @FirImplementationDetail constructor( override var typeRef: FirTypeRef, override var annotations: MutableOrEmptyList, override var calleeReference: FirReference, - override val contextReceiverArguments: MutableList, + override var contextReceiverArguments: MutableOrEmptyList, override val typeArguments: MutableList, override var explicitReceiver: FirExpression?, override var dispatchReceiver: FirExpression, @@ -106,8 +106,7 @@ class FirPropertyAccessExpressionImpl @FirImplementationDetail constructor( } override fun replaceContextReceiverArguments(newContextReceiverArguments: List) { - contextReceiverArguments.clear() - contextReceiverArguments.addAll(newContextReceiverArguments) + contextReceiverArguments = newContextReceiverArguments.toMutableOrEmpty() } override fun replaceTypeArguments(newTypeArguments: List) { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirThisReceiverExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirThisReceiverExpressionImpl.kt index 70566980ae1..b061e296913 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirThisReceiverExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirThisReceiverExpressionImpl.kt @@ -30,7 +30,7 @@ internal class FirThisReceiverExpressionImpl( override var source: KtSourceElement?, override var typeRef: FirTypeRef, override var annotations: MutableOrEmptyList, - override val contextReceiverArguments: MutableList, + override var contextReceiverArguments: MutableOrEmptyList, override val typeArguments: MutableList, override var calleeReference: FirThisReference, override val isImplicit: Boolean, @@ -104,8 +104,7 @@ internal class FirThisReceiverExpressionImpl( } override fun replaceContextReceiverArguments(newContextReceiverArguments: List) { - contextReceiverArguments.clear() - contextReceiverArguments.addAll(newContextReceiverArguments) + contextReceiverArguments = newContextReceiverArguments.toMutableOrEmpty() } override fun replaceTypeArguments(newTypeArguments: List) { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirVariableAssignmentImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirVariableAssignmentImpl.kt index da1b97fd5ca..91bbe2d0a48 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirVariableAssignmentImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirVariableAssignmentImpl.kt @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail internal class FirVariableAssignmentImpl( override var calleeReference: FirReference, override var annotations: MutableOrEmptyList, - override val contextReceiverArguments: MutableList, + override var contextReceiverArguments: MutableOrEmptyList, override val typeArguments: MutableList, override var explicitReceiver: FirExpression?, override var dispatchReceiver: FirExpression, @@ -110,8 +110,7 @@ internal class FirVariableAssignmentImpl( } override fun replaceContextReceiverArguments(newContextReceiverArguments: List) { - contextReceiverArguments.clear() - contextReceiverArguments.addAll(newContextReceiverArguments) + contextReceiverArguments = newContextReceiverArguments.toMutableOrEmpty() } override fun replaceTypeArguments(newTypeArguments: List) { diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/visitors/FirTransformerUtil.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/visitors/FirTransformerUtil.kt index 564d0442a71..fa81f72f547 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/visitors/FirTransformerUtil.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/visitors/FirTransformerUtil.kt @@ -8,7 +8,6 @@ package org.jetbrains.kotlin.fir.visitors import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirPureAbstractElement import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.expressions.FirAnnotation fun T.transformSingle(transformer: FirTransformer, data: D): T { return (this as FirPureAbstractElement).transform(transformer, data) @@ -25,7 +24,7 @@ fun MutableList.transformInplace(transformer: FirTransfor } } -fun MutableOrEmptyList.transformInplace(transformer: FirTransformer, data: D) { +fun MutableOrEmptyList.transformInplace(transformer: FirTransformer, data: D) { list?.transformInplace(transformer, data) } diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/NodeConfigurator.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/NodeConfigurator.kt index d46077e7fdf..06f8c137516 100644 --- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/NodeConfigurator.kt +++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/NodeConfigurator.kt @@ -202,7 +202,7 @@ object NodeConfigurator : AbstractFieldConfigurator(FirTreeBuild } contextReceiverArgumentListOwner.configure { - +fieldList("contextReceiverArguments", expression, withReplace = true) + +fieldList("contextReceiverArguments", expression, useMutableOrEmpty = true, withReplace = true) } qualifiedAccess.configure {