K2: use MutableOrEmptyList for context receivers on declaration site
This commit is contained in:
committed by
Space Team
parent
d20d63786b
commit
e9fbeb9be2
+1
-1
@@ -82,7 +82,7 @@ class FirAnonymousFunctionBuilder : FirFunctionBuilder, FirAnnotationContainerBu
|
||||
deprecationsProvider,
|
||||
containerSource,
|
||||
dispatchReceiverType,
|
||||
contextReceivers,
|
||||
contextReceivers.toMutableOrEmpty(),
|
||||
controlFlowGraphReference,
|
||||
valueParameters,
|
||||
body,
|
||||
|
||||
+1
-1
@@ -81,7 +81,7 @@ class FirBackingFieldBuilder : FirAnnotationContainerBuilder {
|
||||
deprecationsProvider,
|
||||
containerSource,
|
||||
dispatchReceiverType,
|
||||
contextReceivers,
|
||||
contextReceivers.toMutableOrEmpty(),
|
||||
name,
|
||||
delegate,
|
||||
isVar,
|
||||
|
||||
+1
-1
@@ -76,7 +76,7 @@ open class FirConstructorBuilder : FirAbstractConstructorBuilder, FirAnnotationC
|
||||
deprecationsProvider,
|
||||
containerSource,
|
||||
dispatchReceiverType,
|
||||
contextReceivers,
|
||||
contextReceivers.toMutableOrEmpty(),
|
||||
valueParameters,
|
||||
annotations.toMutableOrEmpty(),
|
||||
symbol,
|
||||
|
||||
+1
-1
@@ -83,7 +83,7 @@ class FirDefaultSetterValueParameterBuilder : FirAnnotationContainerBuilder {
|
||||
deprecationsProvider,
|
||||
containerSource,
|
||||
dispatchReceiverType,
|
||||
contextReceivers,
|
||||
contextReceivers.toMutableOrEmpty(),
|
||||
initializer,
|
||||
delegate,
|
||||
isVar,
|
||||
|
||||
+1
-1
@@ -73,7 +73,7 @@ class FirEnumEntryBuilder : FirAnnotationContainerBuilder {
|
||||
deprecationsProvider,
|
||||
containerSource,
|
||||
dispatchReceiverType,
|
||||
contextReceivers,
|
||||
contextReceivers.toMutableOrEmpty(),
|
||||
name,
|
||||
initializer,
|
||||
backingField,
|
||||
|
||||
+1
-1
@@ -69,7 +69,7 @@ class FirErrorFunctionBuilder : FirAnnotationContainerBuilder {
|
||||
deprecationsProvider,
|
||||
containerSource,
|
||||
dispatchReceiverType,
|
||||
contextReceivers,
|
||||
contextReceivers.toMutableOrEmpty(),
|
||||
valueParameters,
|
||||
diagnostic,
|
||||
symbol,
|
||||
|
||||
+1
-1
@@ -70,7 +70,7 @@ class FirErrorPropertyBuilder : FirAnnotationContainerBuilder {
|
||||
deprecationsProvider,
|
||||
containerSource,
|
||||
dispatchReceiverType,
|
||||
contextReceivers,
|
||||
contextReceivers.toMutableOrEmpty(),
|
||||
name,
|
||||
backingField,
|
||||
annotations.toMutableOrEmpty(),
|
||||
|
||||
+1
-1
@@ -78,7 +78,7 @@ open class FirFieldBuilder : FirDeclarationBuilder, FirAnnotationContainerBuilde
|
||||
deprecationsProvider,
|
||||
containerSource,
|
||||
dispatchReceiverType,
|
||||
contextReceivers,
|
||||
contextReceivers.toMutableOrEmpty(),
|
||||
name,
|
||||
initializer,
|
||||
isVar,
|
||||
|
||||
+1
-1
@@ -78,7 +78,7 @@ class FirPrimaryConstructorBuilder : FirAbstractConstructorBuilder, FirAnnotatio
|
||||
deprecationsProvider,
|
||||
containerSource,
|
||||
dispatchReceiverType,
|
||||
contextReceivers,
|
||||
contextReceivers.toMutableOrEmpty(),
|
||||
valueParameters,
|
||||
annotations.toMutableOrEmpty(),
|
||||
symbol,
|
||||
|
||||
+1
-1
@@ -80,7 +80,7 @@ class FirPropertyAccessorBuilder : FirFunctionBuilder, FirAnnotationContainerBui
|
||||
deprecationsProvider,
|
||||
containerSource,
|
||||
dispatchReceiverType,
|
||||
contextReceivers,
|
||||
contextReceivers.toMutableOrEmpty(),
|
||||
valueParameters,
|
||||
body,
|
||||
contractDescription,
|
||||
|
||||
+1
-1
@@ -95,7 +95,7 @@ class FirPropertyBuilder : FirDeclarationBuilder, FirTypeParametersOwnerBuilder,
|
||||
setter,
|
||||
backingField,
|
||||
annotations.toMutableOrEmpty(),
|
||||
contextReceivers,
|
||||
contextReceivers.toMutableOrEmpty(),
|
||||
symbol,
|
||||
delegateFieldSymbol,
|
||||
isLocal,
|
||||
|
||||
+1
-1
@@ -78,7 +78,7 @@ open class FirRegularClassBuilder : FirClassBuilder, FirTypeParameterRefsOwnerBu
|
||||
symbol,
|
||||
companionObjectSymbol,
|
||||
superTypeRefs,
|
||||
contextReceivers,
|
||||
contextReceivers.toMutableOrEmpty(),
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -54,7 +54,7 @@ class FirScriptBuilder : FirAnnotationContainerBuilder {
|
||||
name,
|
||||
statements,
|
||||
symbol,
|
||||
contextReceivers,
|
||||
contextReceivers.toMutableOrEmpty(),
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -79,7 +79,7 @@ open class FirSimpleFunctionBuilder : FirFunctionBuilder, FirTypeParametersOwner
|
||||
deprecationsProvider,
|
||||
containerSource,
|
||||
dispatchReceiverType,
|
||||
contextReceivers,
|
||||
contextReceivers.toMutableOrEmpty(),
|
||||
valueParameters,
|
||||
body,
|
||||
contractDescription,
|
||||
|
||||
+1
-1
@@ -76,7 +76,7 @@ open class FirValueParameterBuilder : FirAnnotationContainerBuilder {
|
||||
deprecationsProvider,
|
||||
containerSource,
|
||||
dispatchReceiverType,
|
||||
contextReceivers,
|
||||
contextReceivers.toMutableOrEmpty(),
|
||||
name,
|
||||
backingField,
|
||||
annotations.toMutableOrEmpty(),
|
||||
|
||||
+2
-3
@@ -50,7 +50,7 @@ internal class FirAnonymousFunctionImpl(
|
||||
override var deprecationsProvider: DeprecationsProvider,
|
||||
override val containerSource: DeserializedContainerSource?,
|
||||
override val dispatchReceiverType: ConeSimpleKotlinType?,
|
||||
override val contextReceivers: MutableList<FirContextReceiver>,
|
||||
override var contextReceivers: MutableOrEmptyList<FirContextReceiver>,
|
||||
override var controlFlowGraphReference: FirControlFlowGraphReference?,
|
||||
override val valueParameters: MutableList<FirValueParameter>,
|
||||
override var body: FirBlock?,
|
||||
@@ -156,8 +156,7 @@ internal class FirAnonymousFunctionImpl(
|
||||
}
|
||||
|
||||
override fun replaceContextReceivers(newContextReceivers: List<FirContextReceiver>) {
|
||||
contextReceivers.clear()
|
||||
contextReceivers.addAll(newContextReceivers)
|
||||
contextReceivers = newContextReceivers.toMutableOrEmpty()
|
||||
}
|
||||
|
||||
override fun replaceControlFlowGraphReference(newControlFlowGraphReference: FirControlFlowGraphReference?) {
|
||||
|
||||
+2
-3
@@ -49,7 +49,7 @@ open class FirBackingFieldImpl @FirImplementationDetail constructor(
|
||||
override var deprecationsProvider: DeprecationsProvider,
|
||||
override val containerSource: DeserializedContainerSource?,
|
||||
override val dispatchReceiverType: ConeSimpleKotlinType?,
|
||||
override val contextReceivers: MutableList<FirContextReceiver>,
|
||||
override var contextReceivers: MutableOrEmptyList<FirContextReceiver>,
|
||||
override val name: Name,
|
||||
override var delegate: FirExpression?,
|
||||
override val isVar: Boolean,
|
||||
@@ -169,8 +169,7 @@ open class FirBackingFieldImpl @FirImplementationDetail constructor(
|
||||
}
|
||||
|
||||
override fun replaceContextReceivers(newContextReceivers: List<FirContextReceiver>) {
|
||||
contextReceivers.clear()
|
||||
contextReceivers.addAll(newContextReceivers)
|
||||
contextReceivers = newContextReceivers.toMutableOrEmpty()
|
||||
}
|
||||
|
||||
override fun replaceGetter(newGetter: FirPropertyAccessor?) {
|
||||
|
||||
+2
-3
@@ -50,7 +50,7 @@ internal class FirConstructorImpl(
|
||||
override var deprecationsProvider: DeprecationsProvider,
|
||||
override val containerSource: DeserializedContainerSource?,
|
||||
override val dispatchReceiverType: ConeSimpleKotlinType?,
|
||||
override val contextReceivers: MutableList<FirContextReceiver>,
|
||||
override var contextReceivers: MutableOrEmptyList<FirContextReceiver>,
|
||||
override val valueParameters: MutableList<FirValueParameter>,
|
||||
override var annotations: MutableOrEmptyList<FirAnnotation>,
|
||||
override val symbol: FirConstructorSymbol,
|
||||
@@ -148,8 +148,7 @@ internal class FirConstructorImpl(
|
||||
}
|
||||
|
||||
override fun replaceContextReceivers(newContextReceivers: List<FirContextReceiver>) {
|
||||
contextReceivers.clear()
|
||||
contextReceivers.addAll(newContextReceivers)
|
||||
contextReceivers = newContextReceivers.toMutableOrEmpty()
|
||||
}
|
||||
|
||||
override fun replaceControlFlowGraphReference(newControlFlowGraphReference: FirControlFlowGraphReference?) {
|
||||
|
||||
+2
-3
@@ -51,7 +51,7 @@ internal class FirDefaultSetterValueParameter(
|
||||
override var deprecationsProvider: DeprecationsProvider,
|
||||
override val containerSource: DeserializedContainerSource?,
|
||||
override val dispatchReceiverType: ConeSimpleKotlinType?,
|
||||
override val contextReceivers: MutableList<FirContextReceiver>,
|
||||
override var contextReceivers: MutableOrEmptyList<FirContextReceiver>,
|
||||
override var initializer: FirExpression?,
|
||||
override var delegate: FirExpression?,
|
||||
override val isVar: Boolean,
|
||||
@@ -178,8 +178,7 @@ internal class FirDefaultSetterValueParameter(
|
||||
}
|
||||
|
||||
override fun replaceContextReceivers(newContextReceivers: List<FirContextReceiver>) {
|
||||
contextReceivers.clear()
|
||||
contextReceivers.addAll(newContextReceivers)
|
||||
contextReceivers = newContextReceivers.toMutableOrEmpty()
|
||||
}
|
||||
|
||||
override fun replaceInitializer(newInitializer: FirExpression?) {
|
||||
|
||||
+2
-3
@@ -49,7 +49,7 @@ internal class FirEnumEntryImpl(
|
||||
override var deprecationsProvider: DeprecationsProvider,
|
||||
override val containerSource: DeserializedContainerSource?,
|
||||
override val dispatchReceiverType: ConeSimpleKotlinType?,
|
||||
override val contextReceivers: MutableList<FirContextReceiver>,
|
||||
override var contextReceivers: MutableOrEmptyList<FirContextReceiver>,
|
||||
override val name: Name,
|
||||
override var initializer: FirExpression?,
|
||||
override var backingField: FirBackingField?,
|
||||
@@ -154,8 +154,7 @@ internal class FirEnumEntryImpl(
|
||||
}
|
||||
|
||||
override fun replaceContextReceivers(newContextReceivers: List<FirContextReceiver>) {
|
||||
contextReceivers.clear()
|
||||
contextReceivers.addAll(newContextReceivers)
|
||||
contextReceivers = newContextReceivers.toMutableOrEmpty()
|
||||
}
|
||||
|
||||
override fun replaceInitializer(newInitializer: FirExpression?) {
|
||||
|
||||
+2
-3
@@ -49,7 +49,7 @@ internal class FirErrorFunctionImpl(
|
||||
override var deprecationsProvider: DeprecationsProvider,
|
||||
override val containerSource: DeserializedContainerSource?,
|
||||
override val dispatchReceiverType: ConeSimpleKotlinType?,
|
||||
override val contextReceivers: MutableList<FirContextReceiver>,
|
||||
override var contextReceivers: MutableOrEmptyList<FirContextReceiver>,
|
||||
override val valueParameters: MutableList<FirValueParameter>,
|
||||
override val diagnostic: ConeDiagnostic,
|
||||
override val symbol: FirErrorFunctionSymbol,
|
||||
@@ -135,8 +135,7 @@ internal class FirErrorFunctionImpl(
|
||||
}
|
||||
|
||||
override fun replaceContextReceivers(newContextReceivers: List<FirContextReceiver>) {
|
||||
contextReceivers.clear()
|
||||
contextReceivers.addAll(newContextReceivers)
|
||||
contextReceivers = newContextReceivers.toMutableOrEmpty()
|
||||
}
|
||||
|
||||
override fun replaceControlFlowGraphReference(newControlFlowGraphReference: FirControlFlowGraphReference?) {
|
||||
|
||||
+2
-3
@@ -49,7 +49,7 @@ internal class FirErrorPropertyImpl(
|
||||
override var deprecationsProvider: DeprecationsProvider,
|
||||
override val containerSource: DeserializedContainerSource?,
|
||||
override val dispatchReceiverType: ConeSimpleKotlinType?,
|
||||
override val contextReceivers: MutableList<FirContextReceiver>,
|
||||
override var contextReceivers: MutableOrEmptyList<FirContextReceiver>,
|
||||
override val name: Name,
|
||||
override var backingField: FirBackingField?,
|
||||
override var annotations: MutableOrEmptyList<FirAnnotation>,
|
||||
@@ -152,8 +152,7 @@ internal class FirErrorPropertyImpl(
|
||||
}
|
||||
|
||||
override fun replaceContextReceivers(newContextReceivers: List<FirContextReceiver>) {
|
||||
contextReceivers.clear()
|
||||
contextReceivers.addAll(newContextReceivers)
|
||||
contextReceivers = newContextReceivers.toMutableOrEmpty()
|
||||
}
|
||||
|
||||
override fun replaceInitializer(newInitializer: FirExpression?) {}
|
||||
|
||||
@@ -51,7 +51,7 @@ class FirFieldImpl @FirImplementationDetail constructor(
|
||||
override var deprecationsProvider: DeprecationsProvider,
|
||||
override val containerSource: DeserializedContainerSource?,
|
||||
override val dispatchReceiverType: ConeSimpleKotlinType?,
|
||||
override val contextReceivers: MutableList<FirContextReceiver>,
|
||||
override var contextReceivers: MutableOrEmptyList<FirContextReceiver>,
|
||||
override val name: Name,
|
||||
override var initializer: FirExpression?,
|
||||
override val isVar: Boolean,
|
||||
@@ -159,8 +159,7 @@ class FirFieldImpl @FirImplementationDetail constructor(
|
||||
}
|
||||
|
||||
override fun replaceContextReceivers(newContextReceivers: List<FirContextReceiver>) {
|
||||
contextReceivers.clear()
|
||||
contextReceivers.addAll(newContextReceivers)
|
||||
contextReceivers = newContextReceivers.toMutableOrEmpty()
|
||||
}
|
||||
|
||||
override fun replaceInitializer(newInitializer: FirExpression?) {
|
||||
|
||||
+2
-3
@@ -51,7 +51,7 @@ class FirPrimaryConstructor @FirImplementationDetail constructor(
|
||||
override var deprecationsProvider: DeprecationsProvider,
|
||||
override val containerSource: DeserializedContainerSource?,
|
||||
override val dispatchReceiverType: ConeSimpleKotlinType?,
|
||||
override val contextReceivers: MutableList<FirContextReceiver>,
|
||||
override var contextReceivers: MutableOrEmptyList<FirContextReceiver>,
|
||||
override val valueParameters: MutableList<FirValueParameter>,
|
||||
override var annotations: MutableOrEmptyList<FirAnnotation>,
|
||||
override val symbol: FirConstructorSymbol,
|
||||
@@ -149,8 +149,7 @@ class FirPrimaryConstructor @FirImplementationDetail constructor(
|
||||
}
|
||||
|
||||
override fun replaceContextReceivers(newContextReceivers: List<FirContextReceiver>) {
|
||||
contextReceivers.clear()
|
||||
contextReceivers.addAll(newContextReceivers)
|
||||
contextReceivers = newContextReceivers.toMutableOrEmpty()
|
||||
}
|
||||
|
||||
override fun replaceControlFlowGraphReference(newControlFlowGraphReference: FirControlFlowGraphReference?) {
|
||||
|
||||
+2
-3
@@ -51,7 +51,7 @@ open class FirPropertyAccessorImpl @FirImplementationDetail constructor(
|
||||
override var deprecationsProvider: DeprecationsProvider,
|
||||
override val containerSource: DeserializedContainerSource?,
|
||||
override val dispatchReceiverType: ConeSimpleKotlinType?,
|
||||
override val contextReceivers: MutableList<FirContextReceiver>,
|
||||
override var contextReceivers: MutableOrEmptyList<FirContextReceiver>,
|
||||
override val valueParameters: MutableList<FirValueParameter>,
|
||||
override var body: FirBlock?,
|
||||
override var contractDescription: FirContractDescription,
|
||||
@@ -148,8 +148,7 @@ open class FirPropertyAccessorImpl @FirImplementationDetail constructor(
|
||||
}
|
||||
|
||||
override fun replaceContextReceivers(newContextReceivers: List<FirContextReceiver>) {
|
||||
contextReceivers.clear()
|
||||
contextReceivers.addAll(newContextReceivers)
|
||||
contextReceivers = newContextReceivers.toMutableOrEmpty()
|
||||
}
|
||||
|
||||
override fun replaceControlFlowGraphReference(newControlFlowGraphReference: FirControlFlowGraphReference?) {
|
||||
|
||||
@@ -61,7 +61,7 @@ internal class FirPropertyImpl(
|
||||
override var setter: FirPropertyAccessor?,
|
||||
override var backingField: FirBackingField?,
|
||||
override var annotations: MutableOrEmptyList<FirAnnotation>,
|
||||
override val contextReceivers: MutableList<FirContextReceiver>,
|
||||
override var contextReceivers: MutableOrEmptyList<FirContextReceiver>,
|
||||
override val symbol: FirPropertySymbol,
|
||||
override val delegateFieldSymbol: FirDelegateFieldSymbol?,
|
||||
override val isLocal: Boolean,
|
||||
@@ -204,8 +204,7 @@ internal class FirPropertyImpl(
|
||||
}
|
||||
|
||||
override fun replaceContextReceivers(newContextReceivers: List<FirContextReceiver>) {
|
||||
contextReceivers.clear()
|
||||
contextReceivers.addAll(newContextReceivers)
|
||||
contextReceivers = newContextReceivers.toMutableOrEmpty()
|
||||
}
|
||||
|
||||
override fun replaceBodyResolveState(newBodyResolveState: FirPropertyBodyResolveState) {
|
||||
|
||||
+1
-1
@@ -52,7 +52,7 @@ internal class FirRegularClassImpl(
|
||||
override val symbol: FirRegularClassSymbol,
|
||||
override var companionObjectSymbol: FirRegularClassSymbol?,
|
||||
override val superTypeRefs: MutableList<FirTypeRef>,
|
||||
override val contextReceivers: MutableList<FirContextReceiver>,
|
||||
override var contextReceivers: MutableOrEmptyList<FirContextReceiver>,
|
||||
) : FirRegularClass() {
|
||||
override var controlFlowGraphReference: FirControlFlowGraphReference? = null
|
||||
override val hasLazyNestedClassifiers: Boolean get() = false
|
||||
|
||||
@@ -38,7 +38,7 @@ internal class FirScriptImpl(
|
||||
override val name: Name,
|
||||
override val statements: MutableList<FirStatement>,
|
||||
override val symbol: FirScriptSymbol,
|
||||
override val contextReceivers: MutableList<FirContextReceiver>,
|
||||
override var contextReceivers: MutableOrEmptyList<FirContextReceiver>,
|
||||
) : FirScript() {
|
||||
init {
|
||||
symbol.bind(this)
|
||||
|
||||
+2
-3
@@ -50,7 +50,7 @@ internal class FirSimpleFunctionImpl(
|
||||
override var deprecationsProvider: DeprecationsProvider,
|
||||
override val containerSource: DeserializedContainerSource?,
|
||||
override val dispatchReceiverType: ConeSimpleKotlinType?,
|
||||
override val contextReceivers: MutableList<FirContextReceiver>,
|
||||
override var contextReceivers: MutableOrEmptyList<FirContextReceiver>,
|
||||
override val valueParameters: MutableList<FirValueParameter>,
|
||||
override var body: FirBlock?,
|
||||
override var contractDescription: FirContractDescription,
|
||||
@@ -149,8 +149,7 @@ internal class FirSimpleFunctionImpl(
|
||||
}
|
||||
|
||||
override fun replaceContextReceivers(newContextReceivers: List<FirContextReceiver>) {
|
||||
contextReceivers.clear()
|
||||
contextReceivers.addAll(newContextReceivers)
|
||||
contextReceivers = newContextReceivers.toMutableOrEmpty()
|
||||
}
|
||||
|
||||
override fun replaceControlFlowGraphReference(newControlFlowGraphReference: FirControlFlowGraphReference?) {
|
||||
|
||||
+2
-3
@@ -50,7 +50,7 @@ internal class FirValueParameterImpl(
|
||||
override var deprecationsProvider: DeprecationsProvider,
|
||||
override val containerSource: DeserializedContainerSource?,
|
||||
override val dispatchReceiverType: ConeSimpleKotlinType?,
|
||||
override val contextReceivers: MutableList<FirContextReceiver>,
|
||||
override var contextReceivers: MutableOrEmptyList<FirContextReceiver>,
|
||||
override val name: Name,
|
||||
override var backingField: FirBackingField?,
|
||||
override var annotations: MutableOrEmptyList<FirAnnotation>,
|
||||
@@ -161,8 +161,7 @@ internal class FirValueParameterImpl(
|
||||
}
|
||||
|
||||
override fun replaceContextReceivers(newContextReceivers: List<FirContextReceiver>) {
|
||||
contextReceivers.clear()
|
||||
contextReceivers.addAll(newContextReceivers)
|
||||
contextReceivers = newContextReceivers.toMutableOrEmpty()
|
||||
}
|
||||
|
||||
override fun replaceInitializer(newInitializer: FirExpression?) {}
|
||||
|
||||
Reference in New Issue
Block a user