azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

K2: use MutableOrEmptyList for context receivers

Browse Source
This commit is contained in:
Mikhail Glukhikh
2022-12-15 10:43:57 +01:00
committed by Space Team
parent dff71a9602
commit ddc786364f
20 changed files with 29 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCallableReferenceAccessBuilder.kt
+1 -1
View File
@@ -50,7 +50,7 @@ class FirCallableReferenceAccessBuilder : FirQualifiedAccessBuilder, FirAnnotati
source,
typeRef,
annotations.toMutableOrEmpty(),
contextReceiverArguments,
contextReceiverArguments.toMutableOrEmpty(),
typeArguments,
explicitReceiver,
dispatchReceiver,
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirComponentCallBuilder.kt
+1 -1
View File
@@ -53,7 +53,7 @@ class FirComponentCallBuilder : FirCallBuilder, FirAnnotationContainerBuilder, F
return FirComponentCallImpl(
source,
annotations.toMutableOrEmpty(),
contextReceiverArguments,
contextReceiverArguments.toMutableOrEmpty(),
typeArguments,
dispatchReceiver,
extensionReceiver,
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirDelegatedConstructorCallBuilder.kt
+1 -1
View File
@@ -47,7 +47,7 @@ class FirDelegatedConstructorCallBuilder : FirCallBuilder, FirAnnotationContaine
source,
annotations.toMutableOrEmpty(),
argumentList,
contextReceiverArguments,
contextReceiverArguments.toMutableOrEmpty(),
constructedTypeRef,
dispatchReceiver,
calleeReference,
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirFunctionCallBuilder.kt
+1 -1
View File
@@ -55,7 +55,7 @@ open class FirFunctionCallBuilder : FirAbstractFunctionCallBuilder, FirAnnotatio
source,
typeRef,
annotations.toMutableOrEmpty(),
contextReceiverArguments,
contextReceiverArguments.toMutableOrEmpty(),
typeArguments,
explicitReceiver,
dispatchReceiver,
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirImplicitInvokeCallBuilder.kt
+1 -1
View File
@@ -51,7 +51,7 @@ open class FirImplicitInvokeCallBuilder : FirAbstractFunctionCallBuilder, FirAnn
return FirImplicitInvokeCallImpl(
source,
annotations.toMutableOrEmpty(),
contextReceiverArguments,
contextReceiverArguments.toMutableOrEmpty(),
typeArguments,
explicitReceiver,
dispatchReceiver,
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirIntegerLiteralOperatorCallBuilder.kt
+1 -1
View File
@@ -53,7 +53,7 @@ open class FirIntegerLiteralOperatorCallBuilder : FirAbstractFunctionCallBuilder
source,
typeRef,
annotations.toMutableOrEmpty(),
contextReceiverArguments,
contextReceiverArguments.toMutableOrEmpty(),
typeArguments,
explicitReceiver,
argumentList,
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirPropertyAccessExpressionBuilder.kt
+1 -1
View File
@@ -52,7 +52,7 @@ class FirPropertyAccessExpressionBuilder : FirQualifiedAccessBuilder, FirAnnotat
typeRef,
annotations.toMutableOrEmpty(),
calleeReference,
contextReceiverArguments,
contextReceiverArguments.toMutableOrEmpty(),
typeArguments,
explicitReceiver,
dispatchReceiver,
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirThisReceiverExpressionBuilder.kt
+1 -1
View File
@@ -47,7 +47,7 @@ class FirThisReceiverExpressionBuilder : FirQualifiedAccessBuilder, FirAnnotatio
source,
typeRef,
annotations.toMutableOrEmpty(),
contextReceiverArguments,
contextReceiverArguments.toMutableOrEmpty(),
typeArguments,
calleeReference,
isImplicit,
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirVariableAssignmentBuilder.kt
+1 -1
View File
@@ -46,7 +46,7 @@ class FirVariableAssignmentBuilder : FirQualifiedAccessBuilder, FirAnnotationCon
return FirVariableAssignmentImpl(
calleeReference,
annotations.toMutableOrEmpty(),
contextReceiverArguments,
contextReceiverArguments.toMutableOrEmpty(),
typeArguments,
explicitReceiver,
dispatchReceiver,
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCallableReferenceAccessImpl.kt
+2 -3
View File
@@ -29,7 +29,7 @@ internal class FirCallableReferenceAccessImpl(
override var source: KtSourceElement?,
override var typeRef: FirTypeRef,
override var annotations: MutableOrEmptyList<FirAnnotation>,
override val contextReceiverArguments: MutableList<FirExpression>,
override var contextReceiverArguments: MutableOrEmptyList<FirExpression>,
override val typeArguments: MutableList<FirTypeProjection>,
override var explicitReceiver: FirExpression?,
override var dispatchReceiver: FirExpression,
@@ -102,8 +102,7 @@ internal class FirCallableReferenceAccessImpl(
}
override fun replaceContextReceiverArguments(newContextReceiverArguments: List<FirExpression>) {
contextReceiverArguments.clear()
contextReceiverArguments.addAll(newContextReceiverArguments)
contextReceiverArguments = newContextReceiverArguments.toMutableOrEmpty()
}
override fun replaceTypeArguments(newTypeArguments: List<FirTypeProjection>) {
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirComponentCallImpl.kt
+2 -3
View File
@@ -34,7 +34,7 @@ import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty
internal class FirComponentCallImpl(
override var source: KtSourceElement?,
override var annotations: MutableOrEmptyList<FirAnnotation>,
override val contextReceiverArguments: MutableList<FirExpression>,
override var contextReceiverArguments: MutableOrEmptyList<FirExpression>,
override val typeArguments: MutableList<FirTypeProjection>,
override var dispatchReceiver: FirExpression,
override var extensionReceiver: FirExpression,
@@ -113,8 +113,7 @@ internal class FirComponentCallImpl(
}
override fun replaceContextReceiverArguments(newContextReceiverArguments: List<FirExpression>) {
contextReceiverArguments.clear()
contextReceiverArguments.addAll(newContextReceiverArguments)
contextReceiverArguments = newContextReceiverArguments.toMutableOrEmpty()
}
override fun replaceTypeArguments(newTypeArguments: List<FirTypeProjection>) {
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirDelegatedConstructorCallImpl.kt
+2 -3
View File
@@ -29,7 +29,7 @@ internal class FirDelegatedConstructorCallImpl(
override val source: KtSourceElement?,
override var annotations: MutableOrEmptyList<FirAnnotation>,
override var argumentList: FirArgumentList,
override val contextReceiverArguments: MutableList<FirExpression>,
override var contextReceiverArguments: MutableOrEmptyList<FirExpression>,
override var constructedTypeRef: FirTypeRef,
override var dispatchReceiver: FirExpression,
override var calleeReference: FirReference,
@@ -78,8 +78,7 @@ internal class FirDelegatedConstructorCallImpl(
}
override fun replaceContextReceiverArguments(newContextReceiverArguments: List<FirExpression>) {
contextReceiverArguments.clear()
contextReceiverArguments.addAll(newContextReceiverArguments)
contextReceiverArguments = newContextReceiverArguments.toMutableOrEmpty()
}
override fun replaceConstructedTypeRef(newConstructedTypeRef: FirTypeRef) {
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirFunctionCallImpl.kt
+2 -3
View File
@@ -31,7 +31,7 @@ open class FirFunctionCallImpl @FirImplementationDetail constructor(
override var source: KtSourceElement?,
override var typeRef: FirTypeRef,
override var annotations: MutableOrEmptyList<FirAnnotation>,
override val contextReceiverArguments: MutableList<FirExpression>,
override var contextReceiverArguments: MutableOrEmptyList<FirExpression>,
override val typeArguments: MutableList<FirTypeProjection>,
override var explicitReceiver: FirExpression?,
override var dispatchReceiver: FirExpression,
@@ -107,8 +107,7 @@ open class FirFunctionCallImpl @FirImplementationDetail constructor(
}
override fun replaceContextReceiverArguments(newContextReceiverArguments: List<FirExpression>) {
contextReceiverArguments.clear()
contextReceiverArguments.addAll(newContextReceiverArguments)
contextReceiverArguments = newContextReceiverArguments.toMutableOrEmpty()
}
override fun replaceTypeArguments(newTypeArguments: List<FirTypeProjection>) {
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirImplicitInvokeCallImpl.kt
+2 -3
View File
@@ -31,7 +31,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail
internal class FirImplicitInvokeCallImpl(
override var source: KtSourceElement?,
override var annotations: MutableOrEmptyList<FirAnnotation>,
override val contextReceiverArguments: MutableList<FirExpression>,
override var contextReceiverArguments: MutableOrEmptyList<FirExpression>,
override val typeArguments: MutableList<FirTypeProjection>,
override var explicitReceiver: FirExpression?,
override var dispatchReceiver: FirExpression,
@@ -109,8 +109,7 @@ internal class FirImplicitInvokeCallImpl(
}
override fun replaceContextReceiverArguments(newContextReceiverArguments: List<FirExpression>) {
contextReceiverArguments.clear()
contextReceiverArguments.addAll(newContextReceiverArguments)
contextReceiverArguments = newContextReceiverArguments.toMutableOrEmpty()
}
override fun replaceTypeArguments(newTypeArguments: List<FirTypeProjection>) {
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirIntegerLiteralOperatorCallImpl.kt
+2 -3
View File
@@ -31,7 +31,7 @@ internal class FirIntegerLiteralOperatorCallImpl(
override var source: KtSourceElement?,
override var typeRef: FirTypeRef,
override var annotations: MutableOrEmptyList<FirAnnotation>,
override val contextReceiverArguments: MutableList<FirExpression>,
override var contextReceiverArguments: MutableOrEmptyList<FirExpression>,
override val typeArguments: MutableList<FirTypeProjection>,
override var explicitReceiver: FirExpression?,
override var argumentList: FirArgumentList,
@@ -117,8 +117,7 @@ internal class FirIntegerLiteralOperatorCallImpl(
}
override fun replaceContextReceiverArguments(newContextReceiverArguments: List<FirExpression>) {
contextReceiverArguments.clear()
contextReceiverArguments.addAll(newContextReceiverArguments)
contextReceiverArguments = newContextReceiverArguments.toMutableOrEmpty()
}
override fun replaceTypeArguments(newTypeArguments: List<FirTypeProjection>) {
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirPropertyAccessExpressionImpl.kt
+2 -3
View File
@@ -30,7 +30,7 @@ class FirPropertyAccessExpressionImpl @FirImplementationDetail constructor(
override var typeRef: FirTypeRef,
override var annotations: MutableOrEmptyList<FirAnnotation>,
override var calleeReference: FirReference,
override val contextReceiverArguments: MutableList<FirExpression>,
override var contextReceiverArguments: MutableOrEmptyList<FirExpression>,
override val typeArguments: MutableList<FirTypeProjection>,
override var explicitReceiver: FirExpression?,
override var dispatchReceiver: FirExpression,
@@ -106,8 +106,7 @@ class FirPropertyAccessExpressionImpl @FirImplementationDetail constructor(
}
override fun replaceContextReceiverArguments(newContextReceiverArguments: List<FirExpression>) {
contextReceiverArguments.clear()
contextReceiverArguments.addAll(newContextReceiverArguments)
contextReceiverArguments = newContextReceiverArguments.toMutableOrEmpty()
}
override fun replaceTypeArguments(newTypeArguments: List<FirTypeProjection>) {
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirThisReceiverExpressionImpl.kt
+2 -3
View File
@@ -30,7 +30,7 @@ internal class FirThisReceiverExpressionImpl(
override var source: KtSourceElement?,
override var typeRef: FirTypeRef,
override var annotations: MutableOrEmptyList<FirAnnotation>,
override val contextReceiverArguments: MutableList<FirExpression>,
override var contextReceiverArguments: MutableOrEmptyList<FirExpression>,
override val typeArguments: MutableList<FirTypeProjection>,
override var calleeReference: FirThisReference,
override val isImplicit: Boolean,
@@ -104,8 +104,7 @@ internal class FirThisReceiverExpressionImpl(
}
override fun replaceContextReceiverArguments(newContextReceiverArguments: List<FirExpression>) {
contextReceiverArguments.clear()
contextReceiverArguments.addAll(newContextReceiverArguments)
contextReceiverArguments = newContextReceiverArguments.toMutableOrEmpty()
}
override fun replaceTypeArguments(newTypeArguments: List<FirTypeProjection>) {
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirVariableAssignmentImpl.kt
+2 -3
View File
@@ -28,7 +28,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail
internal class FirVariableAssignmentImpl(
override var calleeReference: FirReference,
override var annotations: MutableOrEmptyList<FirAnnotation>,
override val contextReceiverArguments: MutableList<FirExpression>,
override var contextReceiverArguments: MutableOrEmptyList<FirExpression>,
override val typeArguments: MutableList<FirTypeProjection>,
override var explicitReceiver: FirExpression?,
override var dispatchReceiver: FirExpression,
@@ -110,8 +110,7 @@ internal class FirVariableAssignmentImpl(
}
override fun replaceContextReceiverArguments(newContextReceiverArguments: List<FirExpression>) {
contextReceiverArguments.clear()
contextReceiverArguments.addAll(newContextReceiverArguments)
contextReceiverArguments = newContextReceiverArguments.toMutableOrEmpty()
}
override fun replaceTypeArguments(newTypeArguments: List<FirTypeProjection>) {
compiler/fir/tree/src/org/jetbrains/kotlin/fir/visitors/FirTransformerUtil.kt
+1 -2
View File
@@ -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 : FirElement, D> T.transformSingle(transformer: FirTransformer<D>, data: D): T {
return (this as FirPureAbstractElement).transform<T, D>(transformer, data)
@@ -25,7 +24,7 @@ fun <T : FirElement, D> MutableList<T>.transformInplace(transformer: FirTransfor
}
}
fun <T : FirAnnotation, D> MutableOrEmptyList<T>.transformInplace(transformer: FirTransformer<D>, data: D) {
fun <T : FirElement, D> MutableOrEmptyList<T>.transformInplace(transformer: FirTransformer<D>, data: D) {
list?.transformInplace(transformer, data)
}
compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/NodeConfigurator.kt
+1 -1
View File
@@ -202,7 +202,7 @@ object NodeConfigurator : AbstractFieldConfigurator<FirTreeBuilder>(FirTreeBuild
}
contextReceiverArgumentListOwner.configure {
+fieldList("contextReceiverArguments", expression, withReplace = true)
+fieldList("contextReceiverArguments", expression, useMutableOrEmpty = true, withReplace = true)
}
qualifiedAccess.configure {