diff --git a/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/ClassDeserialization.kt b/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/ClassDeserialization.kt index 6552756ed8b..e72c1024b39 100644 --- a/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/ClassDeserialization.kt +++ b/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/ClassDeserialization.kt @@ -223,8 +223,9 @@ fun deserializeClassToSymbol( (member as FirProperty?)?.returnTypeRef?.coneTypeSafe() } ?: computeValueClassRepresentation(this, session) - (annotations as MutableList) += + replaceAnnotations( context.annotationDeserializer.loadClassAnnotations(classProto, context.nameResolver) + ) versionRequirementsTable = context.versionRequirementTable diff --git a/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/FirMemberDeserializer.kt b/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/FirMemberDeserializer.kt index 10331bdc64d..c2ffb404bb4 100644 --- a/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/FirMemberDeserializer.kt +++ b/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/FirMemberDeserializer.kt @@ -266,10 +266,11 @@ class FirMemberDeserializer(private val c: FirDeserializationContext) { effectiveVisibility ) }.apply { - (annotations as MutableList) += + replaceAnnotations( c.annotationDeserializer.loadPropertyGetterAnnotations( c.containerSource, proto, local.nameResolver, local.typeTable, getterFlags ) + ) containingClassForStaticMemberAttr = c.dispatchReceiver?.lookupTag } } @@ -324,10 +325,11 @@ class FirMemberDeserializer(private val c: FirDeserializationContext) { effectiveVisibility ) }.apply { - (annotations as MutableList) += + replaceAnnotations( c.annotationDeserializer.loadPropertySetterAnnotations( c.containerSource, proto, local.nameResolver, local.typeTable, setterFlags ) + ) containingClassForStaticMemberAttr = c.dispatchReceiver?.lookupTag } } diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaFacade.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaFacade.kt index ebd026e15b3..07e3ef6a8e5 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaFacade.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaFacade.kt @@ -108,8 +108,6 @@ abstract class FirJavaFacade( variance = INVARIANT isReified = false javaTypeParameterStack.addParameter(this@toFirTypeParameter, symbol) - // TODO: should be lazy (in case annotations refer to the containing class) - annotations.addFromJava(session, this@toFirTypeParameter, javaTypeParameterStack) this.containingDeclarationSymbol = containingDeclarationSymbol for (upperBound in this@toFirTypeParameter.upperBounds) { bounds += upperBound.toFirJavaTypeRef(session, javaTypeParameterStack) @@ -119,6 +117,9 @@ abstract class FirJavaFacade( type = ConeFlexibleType(builtinTypes.anyType.type, builtinTypes.nullableAnyType.type) } } + }.apply { + // TODO: should be lazy (in case annotations refer to the containing class) + addAnnotationsFromJava(session, this@toFirTypeParameter, javaTypeParameterStack) } } @@ -181,7 +182,7 @@ abstract class FirJavaFacade( // 1. Resolve annotations // 2. Enhance type parameter bounds - may refer to each other, take default nullability from annotations // 3. Enhance super types - may refer to type parameter bounds, take default nullability from annotations - firJavaClass.annotations.addFromJava(session, javaClass, javaTypeParameterStack) + firJavaClass.addAnnotationsFromJava(session, javaClass, javaTypeParameterStack) enhancement.enhanceTypeParameterBoundsAfterFirstRound(firJavaClass.typeParameters, initialBounds) @@ -511,10 +512,10 @@ abstract class FirJavaFacade( returnTypeRef = returnType.toFirJavaTypeRef(session, javaTypeParameterStack) resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES origin = javaOrigin(javaField.isFromSource) - // TODO: check if this works properly with annotations that take the enum class as an argument - annotations.addFromJava(session, javaField, javaTypeParameterStack) }.apply { containingClassForStaticMemberAttr = ConeClassLikeLookupTagImpl(classId) + // TODO: check if this works properly with annotations that take the enum class as an argument + addAnnotationsFromJava(session, javaField, javaTypeParameterStack) } else -> buildJavaField { source = javaField.toSourceElement() diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaClass.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaClass.kt index 0cb9e83a79d..ca3cfb80a50 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaClass.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaClass.kt @@ -11,8 +11,10 @@ import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.FirModuleData +import org.jetbrains.kotlin.fir.MutableOrEmptyList import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.builder.FirRegularClassBuilder import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -36,7 +38,7 @@ class FirJavaClass @FirImplementationDetail internal constructor( override var resolvePhase: FirResolvePhase, override val name: Name, override val origin: FirDeclarationOrigin.Java, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override var status: FirDeclarationStatus, override val classKind: ClassKind, override val declarations: MutableList, @@ -108,6 +110,10 @@ class FirJavaClass @FirImplementationDetail internal constructor( return this } + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } + override fun transformAnnotations(transformer: FirTransformer, data: D): FirJavaClass { annotations.transformInplace(transformer, data) return this @@ -152,7 +158,7 @@ class FirJavaClassBuilder : FirRegularClassBuilder(), FirAnnotationContainerBuil resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES, name, origin = javaOrigin(isFromSource), - annotations, + annotations.toMutableOrEmpty(), status, classKind, declarations, diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaConstructor.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaConstructor.kt index b63db055afa..b53568fa158 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaConstructor.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaConstructor.kt @@ -105,6 +105,10 @@ class FirJavaConstructor @FirImplementationDetail constructor( return this } + override fun replaceAnnotations(newAnnotations: List) { + throw AssertionError("Mutating annotations for FirJava* is not supported") + } + override fun transformAnnotations(transformer: FirTransformer, data: D): FirJavaConstructor { return this } diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaField.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaField.kt index 59506a31054..011bd84a286 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaField.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaField.kt @@ -125,6 +125,10 @@ class FirJavaField @FirImplementationDetail constructor( returnTypeRef = newReturnTypeRef } + override fun replaceAnnotations(newAnnotations: List) { + throw AssertionError("Mutating annotations for FirJava* is not supported") + } + override fun transformAnnotations(transformer: FirTransformer, data: D): FirJavaField { return this } diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaMethod.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaMethod.kt index 38aa82b9513..f5cc3f5952a 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaMethod.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaMethod.kt @@ -139,6 +139,10 @@ class FirJavaMethod @FirImplementationDetail constructor( return this } + override fun replaceAnnotations(newAnnotations: List) { + throw AssertionError("Mutating annotations for FirJava* is not supported") + } + override fun transformAnnotations(transformer: FirTransformer, data: D): FirSimpleFunction { return this } diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaValueParameter.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaValueParameter.kt index 25099487478..3f2fb956b60 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaValueParameter.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaValueParameter.kt @@ -142,6 +142,10 @@ class FirJavaValueParameter @FirImplementationDetail constructor( return this } + override fun replaceAnnotations(newAnnotations: List) { + throw AssertionError("Mutating annotations for FirJava* is not supported") + } + override fun transformAnnotations(transformer: FirTransformer, data: D): FirValueParameter { return this } diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/deserialization/JvmClassFileBasedSymbolProvider.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/deserialization/JvmClassFileBasedSymbolProvider.kt index 4e77418581c..591f524acfa 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/deserialization/JvmClassFileBasedSymbolProvider.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/deserialization/JvmClassFileBasedSymbolProvider.kt @@ -8,6 +8,7 @@ package org.jetbrains.kotlin.fir.java.deserialization import org.jetbrains.kotlin.descriptors.SourceElement import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.ThreadSafeMutableState +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.caches.firCachesFactory import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin import org.jetbrains.kotlin.fir.declarations.getDeprecationsProvider @@ -144,7 +145,7 @@ class JvmClassFileBasedSymbolProvider( kotlinClass: KotlinClassFinder.Result.KotlinClass, symbol: FirRegularClassSymbol ) { - val annotations = symbol.fir.annotations as MutableList + val annotations = mutableListOf() kotlinClass.kotlinJvmBinaryClass.loadClassAnnotations( object : KotlinJvmBinaryClass.AnnotationVisitor { override fun visitAnnotation(classId: ClassId, source: SourceElement): KotlinJvmBinaryClass.AnnotationArgumentVisitor? { @@ -156,6 +157,7 @@ class JvmClassFileBasedSymbolProvider( }, kotlinClass.byteContent, ) + symbol.fir.replaceAnnotations(annotations.toMutableOrEmpty()) symbol.fir.replaceDeprecationsProvider(symbol.fir.getDeprecationsProvider(session.firCachesFactory)) } diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/javaAnnotationsMapping.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/javaAnnotationsMapping.kt index e0ae2bdd574..afa004c9269 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/javaAnnotationsMapping.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/javaAnnotationsMapping.kt @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.fir.java +import org.jetbrains.kotlin.fir.FirAnnotationContainer import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.declarations.FirConstructor @@ -48,12 +49,14 @@ internal fun JavaAnnotationOwner.convertAnnotationsToFir( session: FirSession, javaTypeParameterStack: JavaTypeParameterStack ): List = annotations.convertAnnotationsToFir(session, javaTypeParameterStack) -internal fun MutableList.addFromJava( +internal fun FirAnnotationContainer.addAnnotationsFromJava( session: FirSession, javaAnnotationOwner: JavaAnnotationOwner, javaTypeParameterStack: JavaTypeParameterStack ) { - javaAnnotationOwner.annotations.mapTo(this) { it.toFirAnnotationCall(session, javaTypeParameterStack) } + val annotations = mutableListOf() + javaAnnotationOwner.annotations.mapTo(annotations) { it.toFirAnnotationCall(session, javaTypeParameterStack) } + replaceAnnotations(annotations) } internal fun JavaValueParameter.toFirValueParameter( diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/types/jvm/FirJavaTypeRef.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/types/jvm/FirJavaTypeRef.kt index 85b81d2fb5a..04ed2fbd63b 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/types/jvm/FirJavaTypeRef.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/types/jvm/FirJavaTypeRef.kt @@ -49,6 +49,10 @@ class FirJavaTypeRef( return this } + override fun replaceAnnotations(newAnnotations: List) { + throw AssertionError("Mutating annotations for FirJava* is not supported") + } + override fun transformAnnotations(transformer: FirTransformer, data: D): FirUserTypeRef { return this } diff --git a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/DeclarationsConverter.kt b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/DeclarationsConverter.kt index 66033f85ecb..be02c557e81 100644 --- a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/DeclarationsConverter.kt +++ b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/DeclarationsConverter.kt @@ -1235,7 +1235,7 @@ class DeclarationsConverter( symbol, ).also { it.status = defaultAccessorStatus() - it.annotations += modifiers.annotations.filterUseSiteTarget(PROPERTY_GETTER) + it.replaceAnnotations(modifiers.annotations.filterUseSiteTarget(PROPERTY_GETTER)) it.initContainingClassAttr() } // NOTE: We still need the setter even for a val property so we can report errors (e.g., VAL_WITH_SETTER). @@ -1251,7 +1251,7 @@ class DeclarationsConverter( parameterAnnotations = modifiers.annotations.filterUseSiteTarget(SETTER_PARAMETER) ).also { it.status = defaultAccessorStatus() - it.annotations += modifiers.annotations.filterUseSiteTarget(PROPERTY_SETTER) + it.replaceAnnotations(modifiers.annotations.filterUseSiteTarget(PROPERTY_SETTER)) it.initContainingClassAttr() } } else null @@ -1417,8 +1417,7 @@ class DeclarationsConverter( isGetter ) .also { accessor -> - accessor.annotations += modifiers.annotations - accessor.annotations += accessorAdditionalAnnotations + accessor.replaceAnnotations(modifiers.annotations + accessorAdditionalAnnotations) accessor.status = status accessor.initContainingClassAttr() } @@ -2022,7 +2021,12 @@ class DeclarationsConverter( } for (modifierList in allTypeModifiers) { - (calculatedFirType.annotations as MutableList) += modifierList.annotations + if (modifierList.annotations.isNotEmpty()) { + val replacementAnnotations = + if (calculatedFirType.annotations.isNotEmpty()) calculatedFirType.annotations + modifierList.annotations + else modifierList.annotations + calculatedFirType.replaceAnnotations(replacementAnnotations) + } } return calculatedFirType } diff --git a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/ExpressionsConverter.kt b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/ExpressionsConverter.kt index f3386f384ad..7143e0dfc5e 100644 --- a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/ExpressionsConverter.kt +++ b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/ExpressionsConverter.kt @@ -451,7 +451,10 @@ class ExpressionsConverter( val result = firExpression ?: buildErrorExpression(null, ConeNotAnnotationContainer("???")) require(result is FirAnnotationContainer) - (result.annotations as MutableList) += firAnnotationList + if (firAnnotationList.isNotEmpty()) { + val replacementAnnotations = if (result.annotations.isNotEmpty()) result.annotations + firAnnotationList else firAnnotationList + result.replaceAnnotations(replacementAnnotations) + } return result } diff --git a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/fir/ValueParameter.kt b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/fir/ValueParameter.kt index 58ca9957bbd..945175acd4f 100644 --- a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/fir/ValueParameter.kt +++ b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/fir/ValueParameter.kt @@ -158,7 +158,7 @@ class ValueParameter( symbol, ).also { it.initContainingClassAttr(context) - it.annotations += modifiers.annotations.filterUseSiteTarget(AnnotationUseSiteTarget.PROPERTY_GETTER) + it.replaceAnnotations(modifiers.annotations.filterUseSiteTarget(AnnotationUseSiteTarget.PROPERTY_GETTER)) } setter = if (this.isVar) FirDefaultPropertySetter( defaultAccessorSource, @@ -170,7 +170,7 @@ class ValueParameter( parameterAnnotations = modifiers.annotations.filterUseSiteTarget(AnnotationUseSiteTarget.SETTER_PARAMETER) ).also { it.initContainingClassAttr(context) - it.annotations += modifiers.annotations.filterUseSiteTarget(AnnotationUseSiteTarget.PROPERTY_SETTER) + it.replaceAnnotations(modifiers.annotations.filterUseSiteTarget(AnnotationUseSiteTarget.PROPERTY_SETTER)) } else null }.apply { if (firValueParameter.isVararg) { diff --git a/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt b/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt index 2cfdc50a94c..187e7055c21 100644 --- a/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt +++ b/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt @@ -354,7 +354,7 @@ open class RawFirBuilder( val lastChild = children.lastOrNull() if (lastChild is KtBlockExpression) { firBlock = lastChild.toFirBlock() - extractAnnotationsTo(firBlock.annotations as MutableList) + extractAnnotationsTo(firBlock) } } firBlock ?: FirSingleExpressionBlock(convert()) @@ -499,7 +499,12 @@ open class RawFirBuilder( if (this != null) { it.extractAnnotationsFrom(this) } - it.annotations += accessorAnnotationsFromProperty + val resultAnnotations = when { + accessorAnnotationsFromProperty.isEmpty() -> it.annotations + it.annotations.isEmpty() -> accessorAnnotationsFromProperty + else -> it.annotations + accessorAnnotationsFromProperty + } + it.replaceAnnotations(resultAnnotations) it.status = status it.initContainingClassAttr() } @@ -660,7 +665,7 @@ open class RawFirBuilder( symbol, ).also { getter -> getter.initContainingClassAttr() - getter.annotations += parameterAnnotations.filterUseSiteTarget(PROPERTY_GETTER) + getter.replaceAnnotations(parameterAnnotations.filterUseSiteTarget(PROPERTY_GETTER)) } setter = if (isMutable) FirDefaultPropertySetter( defaultAccessorSource, @@ -672,7 +677,7 @@ open class RawFirBuilder( parameterAnnotations = parameterAnnotations.filterUseSiteTarget(SETTER_PARAMETER) ).also { setter -> setter.initContainingClassAttr() - setter.annotations += parameterAnnotations.filterUseSiteTarget(PROPERTY_SETTER) + setter.replaceAnnotations(parameterAnnotations.filterUseSiteTarget(PROPERTY_SETTER)) } else null annotations += parameterAnnotations.filter { it.useSiteTarget == null || it.useSiteTarget == PROPERTY || @@ -691,17 +696,23 @@ open class RawFirBuilder( } private fun FirDefaultPropertyAccessor.extractAnnotationsFrom(annotated: KtAnnotated) { - annotated.extractAnnotationsTo(this.annotations) + annotated.extractAnnotationsTo(this) } - private fun KtAnnotated.extractAnnotationsTo(container: MutableList) { + private fun KtAnnotated.extractAnnotationsTo(container: FirAnnotationContainer) { + if (annotationEntries.isEmpty()) return + val annotations = mutableListOf() + annotations.addAll(container.annotations) for (annotationEntry in annotationEntries) { - container += annotationEntry.convert() + annotations += annotationEntry.convert() } + container.replaceAnnotations(annotations) } private fun KtAnnotated.extractAnnotationsTo(container: FirAnnotationContainerBuilder) { - extractAnnotationsTo(container.annotations) + for (annotationEntry in annotationEntries) { + container.annotations += annotationEntry.convert() + } } private fun KtTypeParameterListOwner.extractTypeParametersTo( @@ -2647,7 +2658,7 @@ open class RawFirBuilder( expression.toFirSourceElement(), ConeNotAnnotationContainer(rawResult?.render() ?: "???") ) - expression.extractAnnotationsTo(result.annotations as MutableList) + expression.extractAnnotationsTo(result) return result } diff --git a/compiler/fir/raw-fir/raw-fir.common/src/org/jetbrains/kotlin/fir/builder/BaseFirBuilder.kt b/compiler/fir/raw-fir/raw-fir.common/src/org/jetbrains/kotlin/fir/builder/BaseFirBuilder.kt index 224fa4f52ca..730978a2db6 100644 --- a/compiler/fir/raw-fir/raw-fir.common/src/org/jetbrains/kotlin/fir/builder/BaseFirBuilder.kt +++ b/compiler/fir/raw-fir/raw-fir.common/src/org/jetbrains/kotlin/fir/builder/BaseFirBuilder.kt @@ -958,7 +958,13 @@ abstract class BaseFirBuilder(val baseSession: FirSession, val context: Conte } return if (operation == FirOperation.ASSIGN) { val result = unwrappedLhs.convert() - (result.annotations as MutableList) += annotations + if (annotations.isNotEmpty()) { + val annotationsToReplace = if (result.annotations.isEmpty()) annotations else mutableListOf().apply { + addAll(result.annotations) + addAll(annotations) + } + result.replaceAnnotations(annotationsToReplace) + } result.pullUpSafeCallIfNecessary() } else { val receiver = unwrappedLhs.convert() diff --git a/compiler/fir/raw-fir/raw-fir.common/src/org/jetbrains/kotlin/fir/builder/ConversionUtils.kt b/compiler/fir/raw-fir/raw-fir.common/src/org/jetbrains/kotlin/fir/builder/ConversionUtils.kt index a142efe76a8..3f653084e89 100644 --- a/compiler/fir/raw-fir/raw-fir.common/src/org/jetbrains/kotlin/fir/builder/ConversionUtils.kt +++ b/compiler/fir/raw-fir/raw-fir.common/src/org/jetbrains/kotlin/fir/builder/ConversionUtils.kt @@ -577,7 +577,10 @@ fun FirTypeRef.convertToReceiverParameter(): FirReceiverParameter { source = typeRef.source?.fakeElement(KtFakeSourceElementKind.ReceiverFromType) @Suppress("UNCHECKED_CAST") annotations += (typeRef.annotations as List).filterUseSiteTarget(AnnotationUseSiteTarget.RECEIVER) - (typeRef.annotations as MutableList).removeIf { it.useSiteTarget == AnnotationUseSiteTarget.RECEIVER } + val filteredTypeRefAnnotations = typeRef.annotations.filterNot { it.useSiteTarget == AnnotationUseSiteTarget.RECEIVER } + if (filteredTypeRefAnnotations.size != typeRef.annotations.size) { + typeRef.replaceAnnotations(filteredTypeRefAnnotations) + } this.typeRef = typeRef } } diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CallableReferenceResolution.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CallableReferenceResolution.kt index 14462a6a1f1..94e608e69a9 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CallableReferenceResolution.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CallableReferenceResolution.kt @@ -381,6 +381,10 @@ class FirFakeArgumentForCallableReference( shouldNotBeCalled() } + override fun replaceAnnotations(newAnnotations: List) { + shouldNotBeCalled() + } + override fun transformAnnotations(transformer: FirTransformer, data: D): FirNamedArgumentExpression { shouldNotBeCalled() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirAnnotationContainer.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirAnnotationContainer.kt index bad4e0ea7e7..898d404cfe7 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirAnnotationContainer.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirAnnotationContainer.kt @@ -24,5 +24,7 @@ interface FirAnnotationContainer : FirElement { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformAnnotationContainer(this, data) as E + fun replaceAnnotations(newAnnotations: List) + fun transformAnnotations(transformer: FirTransformer, data: D): FirAnnotationContainer } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirFileAnnotationsContainer.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirFileAnnotationsContainer.kt index 570951fb291..20cffc77aa2 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirFileAnnotationsContainer.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirFileAnnotationsContainer.kt @@ -31,5 +31,7 @@ abstract class FirFileAnnotationsContainer : FirElementWithResolvePhase(), FirAn abstract override fun replaceResolvePhase(newResolvePhase: FirResolvePhase) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirFileAnnotationsContainer } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/builder/FirFileAnnotationsContainerBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/builder/FirFileAnnotationsContainerBuilder.kt index a0c50f5d999..74d6a2fcedf 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/builder/FirFileAnnotationsContainerBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/builder/FirFileAnnotationsContainerBuilder.kt @@ -13,6 +13,7 @@ import org.jetbrains.kotlin.fir.FirFileAnnotationsContainer import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.impl.FirFileAnnotationsContainerImpl @@ -37,7 +38,7 @@ class FirFileAnnotationsContainerBuilder : FirAnnotationContainerBuilder { source, resolvePhase, moduleData, - annotations, + annotations.toMutableOrEmpty(), containingFileSymbol, ) } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousFunction.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousFunction.kt index 631bf597de1..5333bccf44c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousFunction.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousFunction.kt @@ -58,6 +58,8 @@ abstract class FirAnonymousFunction : FirFunction(), FirTypeParametersOwner { abstract override fun replaceResolvePhase(newResolvePhase: FirResolvePhase) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun replaceReturnTypeRef(newReturnTypeRef: FirTypeRef) abstract override fun replaceReceiverParameter(newReceiverParameter: FirReceiverParameter?) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousInitializer.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousInitializer.kt index c35b4bc3107..8fc439db31b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousInitializer.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousInitializer.kt @@ -40,6 +40,8 @@ abstract class FirAnonymousInitializer : FirDeclaration(), FirControlFlowGraphOw abstract override fun replaceResolvePhase(newResolvePhase: FirResolvePhase) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun replaceControlFlowGraphReference(newControlFlowGraphReference: FirControlFlowGraphReference?) abstract fun replaceBody(newBody: FirBlock?) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousObject.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousObject.kt index 59c9b56c6ff..c5e896cbda2 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousObject.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousObject.kt @@ -50,6 +50,8 @@ abstract class FirAnonymousObject : FirClass(), FirControlFlowGraphOwner { abstract override fun replaceSuperTypeRefs(newSuperTypeRefs: List) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun replaceControlFlowGraphReference(newControlFlowGraphReference: FirControlFlowGraphReference?) abstract override fun transformTypeParameters(transformer: FirTransformer, data: D): FirAnonymousObject diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirBackingField.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirBackingField.kt index e61a6d8eb6d..8ddcab3728f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirBackingField.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirBackingField.kt @@ -72,6 +72,8 @@ abstract class FirBackingField : FirVariable(), FirTypeParametersOwner, FirState abstract override fun replaceInitializer(newInitializer: FirExpression?) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun transformReturnTypeRef(transformer: FirTransformer, data: D): FirBackingField abstract override fun transformReceiverParameter(transformer: FirTransformer, data: D): FirBackingField diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirCallableDeclaration.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirCallableDeclaration.kt index 26433e4d20a..37ae8029645 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirCallableDeclaration.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirCallableDeclaration.kt @@ -45,6 +45,8 @@ sealed class FirCallableDeclaration : FirMemberDeclaration() { abstract override fun replaceResolvePhase(newResolvePhase: FirResolvePhase) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract fun replaceReturnTypeRef(newReturnTypeRef: FirTypeRef) abstract fun replaceReceiverParameter(newReceiverParameter: FirReceiverParameter?) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirClass.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirClass.kt index 8247a07a17d..02b19d3da77 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirClass.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirClass.kt @@ -49,6 +49,8 @@ sealed class FirClass : FirClassLikeDeclaration(), FirStatement, FirTypeParamete abstract fun replaceSuperTypeRefs(newSuperTypeRefs: List) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun transformTypeParameters(transformer: FirTransformer, data: D): FirClass abstract override fun transformStatus(transformer: FirTransformer, data: D): FirClass diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirClassLikeDeclaration.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirClassLikeDeclaration.kt index 4e370f48eea..4abdcffc490 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirClassLikeDeclaration.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirClassLikeDeclaration.kt @@ -38,6 +38,8 @@ sealed class FirClassLikeDeclaration : FirMemberDeclaration(), FirStatement { abstract override fun replaceResolvePhase(newResolvePhase: FirResolvePhase) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract fun replaceDeprecationsProvider(newDeprecationsProvider: DeprecationsProvider) abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirClassLikeDeclaration diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirConstructor.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirConstructor.kt index d64f4c9cbb6..abc29213ed2 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirConstructor.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirConstructor.kt @@ -65,6 +65,8 @@ abstract class FirConstructor : FirFunction(), FirTypeParameterRefsOwner { abstract override fun replaceValueParameters(newValueParameters: List) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract fun replaceDelegatedConstructor(newDelegatedConstructor: FirDelegatedConstructorCall?) abstract override fun replaceBody(newBody: FirBlock?) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirDeclaration.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirDeclaration.kt index 917892f445e..b48c136fc6d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirDeclaration.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirDeclaration.kt @@ -36,5 +36,7 @@ sealed class FirDeclaration : FirElementWithResolvePhase(), FirAnnotationContain abstract override fun replaceResolvePhase(newResolvePhase: FirResolvePhase) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirDeclaration } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirEnumEntry.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirEnumEntry.kt index d1bb681002c..f84db8d1951 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirEnumEntry.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirEnumEntry.kt @@ -69,6 +69,8 @@ abstract class FirEnumEntry : FirVariable() { abstract override fun replaceSetter(newSetter: FirPropertyAccessor?) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun transformTypeParameters(transformer: FirTransformer, data: D): FirEnumEntry abstract override fun transformStatus(transformer: FirTransformer, data: D): FirEnumEntry diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorFunction.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorFunction.kt index 634794117b4..09dff2a3680 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorFunction.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorFunction.kt @@ -53,6 +53,8 @@ abstract class FirErrorFunction : FirFunction(), FirDiagnosticHolder { abstract override fun replaceResolvePhase(newResolvePhase: FirResolvePhase) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun replaceReturnTypeRef(newReturnTypeRef: FirTypeRef) abstract override fun replaceReceiverParameter(newReceiverParameter: FirReceiverParameter?) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorProperty.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorProperty.kt index d9796f5a4af..8128744ef9e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorProperty.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorProperty.kt @@ -72,6 +72,8 @@ abstract class FirErrorProperty : FirVariable(), FirDiagnosticHolder { abstract override fun replaceSetter(newSetter: FirPropertyAccessor?) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun transformTypeParameters(transformer: FirTransformer, data: D): FirErrorProperty abstract override fun transformStatus(transformer: FirTransformer, data: D): FirErrorProperty diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirField.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirField.kt index 035cc7bb365..e7cd17f920e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirField.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirField.kt @@ -71,6 +71,8 @@ abstract class FirField : FirVariable(), FirControlFlowGraphOwner { abstract override fun replaceSetter(newSetter: FirPropertyAccessor?) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun replaceControlFlowGraphReference(newControlFlowGraphReference: FirControlFlowGraphReference?) abstract override fun transformTypeParameters(transformer: FirTransformer, data: D): FirField diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirFile.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirFile.kt index e8a97f0bcca..e80ab57bca5 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirFile.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirFile.kt @@ -45,6 +45,8 @@ abstract class FirFile : FirDeclaration() { abstract override fun replaceResolvePhase(newResolvePhase: FirResolvePhase) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirFile abstract fun transformAnnotationsContainer(transformer: FirTransformer, data: D): FirFile diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirFunction.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirFunction.kt index b92f6f2e524..471c7094e8b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirFunction.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirFunction.kt @@ -52,6 +52,8 @@ sealed class FirFunction : FirCallableDeclaration(), FirTargetElement, FirContro abstract override fun replaceResolvePhase(newResolvePhase: FirResolvePhase) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun replaceReturnTypeRef(newReturnTypeRef: FirTypeRef) abstract override fun replaceReceiverParameter(newReceiverParameter: FirReceiverParameter?) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirMemberDeclaration.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirMemberDeclaration.kt index b0f25828667..042f86149dc 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirMemberDeclaration.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirMemberDeclaration.kt @@ -36,6 +36,8 @@ sealed class FirMemberDeclaration : FirDeclaration(), FirTypeParameterRefsOwner abstract override fun replaceResolvePhase(newResolvePhase: FirResolvePhase) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirMemberDeclaration abstract override fun transformTypeParameters(transformer: FirTransformer, data: D): FirMemberDeclaration diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirProperty.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirProperty.kt index ae9628ed4d0..ce9ae7dfce3 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirProperty.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirProperty.kt @@ -73,6 +73,8 @@ abstract class FirProperty : FirVariable(), FirTypeParametersOwner, FirControlFl abstract override fun replaceSetter(newSetter: FirPropertyAccessor?) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun replaceControlFlowGraphReference(newControlFlowGraphReference: FirControlFlowGraphReference?) abstract override fun replaceContextReceivers(newContextReceivers: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirPropertyAccessor.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirPropertyAccessor.kt index 2c7b2259249..9b30f42f9a3 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirPropertyAccessor.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirPropertyAccessor.kt @@ -72,6 +72,8 @@ abstract class FirPropertyAccessor : FirFunction(), FirContractDescriptionOwner, abstract override fun replaceContractDescription(newContractDescription: FirContractDescription) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun transformStatus(transformer: FirTransformer, data: D): FirPropertyAccessor abstract override fun transformReturnTypeRef(transformer: FirTransformer, data: D): FirPropertyAccessor diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirReceiverParameter.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirReceiverParameter.kt index aa29cf3a87d..b12754bb188 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirReceiverParameter.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirReceiverParameter.kt @@ -31,6 +31,8 @@ abstract class FirReceiverParameter : FirPureAbstractElement(), FirAnnotationCon abstract fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract fun transformTypeRef(transformer: FirTransformer, data: D): FirReceiverParameter abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirReceiverParameter diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirRegularClass.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirRegularClass.kt index 02c5df66521..1b19600930e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirRegularClass.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirRegularClass.kt @@ -53,6 +53,8 @@ abstract class FirRegularClass : FirClass(), FirControlFlowGraphOwner { abstract override fun replaceDeprecationsProvider(newDeprecationsProvider: DeprecationsProvider) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun replaceControlFlowGraphReference(newControlFlowGraphReference: FirControlFlowGraphReference?) abstract fun replaceCompanionObjectSymbol(newCompanionObjectSymbol: FirRegularClassSymbol?) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirScript.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirScript.kt index 63e54bf9b45..18f67911a72 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirScript.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirScript.kt @@ -39,6 +39,8 @@ abstract class FirScript : FirDeclaration() { abstract override fun replaceResolvePhase(newResolvePhase: FirResolvePhase) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirScript abstract fun transformStatements(transformer: FirTransformer, data: D): FirScript diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirSimpleFunction.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirSimpleFunction.kt index e11b0fe8fae..fcb151f056d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirSimpleFunction.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirSimpleFunction.kt @@ -70,6 +70,8 @@ abstract class FirSimpleFunction : FirFunction(), FirContractDescriptionOwner, F abstract override fun replaceContractDescription(newContractDescription: FirContractDescription) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun transformStatus(transformer: FirTransformer, data: D): FirSimpleFunction abstract override fun transformReturnTypeRef(transformer: FirTransformer, data: D): FirSimpleFunction diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeAlias.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeAlias.kt index 4d6a7b3ef04..3fab8ebdd64 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeAlias.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeAlias.kt @@ -45,6 +45,8 @@ abstract class FirTypeAlias : FirClassLikeDeclaration(), FirTypeParametersOwner abstract fun replaceExpandedTypeRef(newExpandedTypeRef: FirTypeRef) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun transformStatus(transformer: FirTransformer, data: D): FirTypeAlias abstract override fun transformTypeParameters(transformer: FirTransformer, data: D): FirTypeAlias diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeParameter.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeParameter.kt index 8e9b040887d..d0b4aa8782c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeParameter.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeParameter.kt @@ -45,5 +45,7 @@ abstract class FirTypeParameter : FirTypeParameterRef, FirDeclaration() { abstract fun replaceBounds(newBounds: List) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirTypeParameter } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirValueParameter.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirValueParameter.kt index d43edf0af22..f8c97d292c6 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirValueParameter.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirValueParameter.kt @@ -77,6 +77,8 @@ abstract class FirValueParameter : FirVariable(), FirControlFlowGraphOwner { abstract override fun replaceSetter(newSetter: FirPropertyAccessor?) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun replaceControlFlowGraphReference(newControlFlowGraphReference: FirControlFlowGraphReference?) abstract fun replaceDefaultValue(newDefaultValue: FirExpression?) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirVariable.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirVariable.kt index c69ea122814..0ad3032d10b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirVariable.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirVariable.kt @@ -70,6 +70,8 @@ sealed class FirVariable : FirCallableDeclaration(), FirStatement { abstract fun replaceSetter(newSetter: FirPropertyAccessor?) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun transformTypeParameters(transformer: FirTransformer, data: D): FirVariable abstract override fun transformStatus(transformer: FirTransformer, data: D): FirVariable diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousFunctionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousFunctionBuilder.kt index bcb4e9fa996..0b3505da879 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousFunctionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousFunctionBuilder.kt @@ -14,6 +14,7 @@ import org.jetbrains.kotlin.fir.FirLabel import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.declarations.DeprecationsProvider import org.jetbrains.kotlin.fir.declarations.FirAnonymousFunction import org.jetbrains.kotlin.fir.declarations.FirContextReceiver @@ -72,7 +73,7 @@ class FirAnonymousFunctionBuilder : FirFunctionBuilder, FirAnnotationContainerBu override fun build(): FirAnonymousFunction { return FirAnonymousFunctionImpl( source, - annotations, + annotations.toMutableOrEmpty(), moduleData, origin, attributes, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousInitializerBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousInitializerBuilder.kt index 393df4dec10..055637f309c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousInitializerBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousInitializerBuilder.kt @@ -12,6 +12,7 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.declarations.FirAnonymousInitializer import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousObjectBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousObjectBuilder.kt index df9f839b807..f71c704e423 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousObjectBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousObjectBuilder.kt @@ -13,6 +13,7 @@ import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.declarations.DeprecationsProvider import org.jetbrains.kotlin.fir.declarations.FirAnonymousObject import org.jetbrains.kotlin.fir.declarations.FirDeclaration @@ -67,7 +68,7 @@ class FirAnonymousObjectBuilder : FirDeclarationBuilder, FirClassBuilder, FirAnn classKind, superTypeRefs, declarations, - annotations, + annotations.toMutableOrEmpty(), scopeProvider, symbol, ) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirBackingFieldBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirBackingFieldBuilder.kt index f264928710a..6ecfcddcc01 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirBackingFieldBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirBackingFieldBuilder.kt @@ -13,6 +13,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.declarations.DeprecationsProvider import org.jetbrains.kotlin.fir.declarations.FirBackingField import org.jetbrains.kotlin.fir.declarations.FirContextReceiver @@ -91,7 +92,7 @@ class FirBackingFieldBuilder : FirAnnotationContainerBuilder { symbol, propertySymbol, initializer, - annotations, + annotations.toMutableOrEmpty(), typeParameters, status, ) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirConstructorBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirConstructorBuilder.kt index 17c754a0753..e0de0611439 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirConstructorBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirConstructorBuilder.kt @@ -12,6 +12,7 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.declarations.DeprecationsProvider import org.jetbrains.kotlin.fir.declarations.FirConstructor import org.jetbrains.kotlin.fir.declarations.FirContextReceiver @@ -77,7 +78,7 @@ open class FirConstructorBuilder : FirAbstractConstructorBuilder, FirAnnotationC dispatchReceiverType, contextReceivers, valueParameters, - annotations, + annotations.toMutableOrEmpty(), symbol, delegatedConstructor, body, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirDefaultSetterValueParameterBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirDefaultSetterValueParameterBuilder.kt index c449df298b8..45205a2a25e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirDefaultSetterValueParameterBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirDefaultSetterValueParameterBuilder.kt @@ -12,6 +12,7 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.declarations.DeprecationsProvider import org.jetbrains.kotlin.fir.declarations.FirBackingField import org.jetbrains.kotlin.fir.declarations.FirContextReceiver @@ -90,7 +91,7 @@ class FirDefaultSetterValueParameterBuilder : FirAnnotationContainerBuilder { getter, setter, backingField, - annotations, + annotations.toMutableOrEmpty(), symbol, defaultValue, containingFunctionSymbol, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirEnumEntryBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirEnumEntryBuilder.kt index 6376aaced45..18625f36a03 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirEnumEntryBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirEnumEntryBuilder.kt @@ -12,6 +12,7 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.declarations.DeprecationsProvider import org.jetbrains.kotlin.fir.declarations.FirBackingField import org.jetbrains.kotlin.fir.declarations.FirContextReceiver @@ -76,7 +77,7 @@ class FirEnumEntryBuilder : FirAnnotationContainerBuilder { name, initializer, backingField, - annotations, + annotations.toMutableOrEmpty(), symbol, ) } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorFunctionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorFunctionBuilder.kt index e91d296fb3c..e66c2c295b3 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorFunctionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorFunctionBuilder.kt @@ -12,6 +12,7 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.declarations.DeprecationsProvider import org.jetbrains.kotlin.fir.declarations.FirContextReceiver import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes @@ -61,7 +62,7 @@ class FirErrorFunctionBuilder : FirAnnotationContainerBuilder { return FirErrorFunctionImpl( source, resolvePhase, - annotations, + annotations.toMutableOrEmpty(), moduleData, origin, attributes, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorPropertyBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorPropertyBuilder.kt index 57a7796434f..91f27762ba5 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorPropertyBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorPropertyBuilder.kt @@ -12,6 +12,7 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.declarations.DeprecationsProvider import org.jetbrains.kotlin.fir.declarations.FirBackingField import org.jetbrains.kotlin.fir.declarations.FirContextReceiver @@ -72,7 +73,7 @@ class FirErrorPropertyBuilder : FirAnnotationContainerBuilder { contextReceivers, name, backingField, - annotations, + annotations.toMutableOrEmpty(), diagnostic, symbol, ) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFieldBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFieldBuilder.kt index 4e1c82524b1..65fe86b511b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFieldBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFieldBuilder.kt @@ -13,6 +13,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.declarations.DeprecationsProvider import org.jetbrains.kotlin.fir.declarations.FirBackingField import org.jetbrains.kotlin.fir.declarations.FirContextReceiver @@ -82,7 +83,7 @@ open class FirFieldBuilder : FirDeclarationBuilder, FirAnnotationContainerBuilde initializer, isVar, backingField, - annotations, + annotations.toMutableOrEmpty(), symbol, ) } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFileBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFileBuilder.kt index 4f2ceb2c3e8..b9b4cd07450 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFileBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFileBuilder.kt @@ -16,6 +16,7 @@ import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.FirPackageDirective import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.declarations.FirDeclaration import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPrimaryConstructorBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPrimaryConstructorBuilder.kt index b4df74b9759..ef095cdd9e0 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPrimaryConstructorBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPrimaryConstructorBuilder.kt @@ -13,6 +13,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.declarations.DeprecationsProvider import org.jetbrains.kotlin.fir.declarations.FirConstructor import org.jetbrains.kotlin.fir.declarations.FirContextReceiver @@ -79,7 +80,7 @@ class FirPrimaryConstructorBuilder : FirAbstractConstructorBuilder, FirAnnotatio dispatchReceiverType, contextReceivers, valueParameters, - annotations, + annotations.toMutableOrEmpty(), symbol, delegatedConstructor, body, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPropertyAccessorBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPropertyAccessorBuilder.kt index 43b7c8b5a5b..dfbee3ba3cf 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPropertyAccessorBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPropertyAccessorBuilder.kt @@ -14,6 +14,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.contracts.FirContractDescription import org.jetbrains.kotlin.fir.contracts.impl.FirEmptyContractDescription import org.jetbrains.kotlin.fir.declarations.DeprecationsProvider @@ -86,7 +87,7 @@ class FirPropertyAccessorBuilder : FirFunctionBuilder, FirAnnotationContainerBui symbol, propertySymbol, isGetter, - annotations, + annotations.toMutableOrEmpty(), typeParameters, ) } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPropertyBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPropertyBuilder.kt index f74ef5bc415..7ba747227c0 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPropertyBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPropertyBuilder.kt @@ -12,6 +12,7 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.declarations.DeprecationsProvider import org.jetbrains.kotlin.fir.declarations.FirBackingField import org.jetbrains.kotlin.fir.declarations.FirContextReceiver @@ -93,7 +94,7 @@ class FirPropertyBuilder : FirDeclarationBuilder, FirTypeParametersOwnerBuilder, getter, setter, backingField, - annotations, + annotations.toMutableOrEmpty(), contextReceivers, symbol, delegateFieldSymbol, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirReceiverParameterBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirReceiverParameterBuilder.kt index 6881fe08901..99ce4c3f379 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirReceiverParameterBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirReceiverParameterBuilder.kt @@ -11,6 +11,7 @@ import kotlin.contracts.* import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.declarations.FirReceiverParameter import org.jetbrains.kotlin.fir.declarations.impl.FirReceiverParameterImpl import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -32,7 +33,7 @@ class FirReceiverParameterBuilder : FirAnnotationContainerBuilder { return FirReceiverParameterImpl( source, typeRef, - annotations, + annotations.toMutableOrEmpty(), ) } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirRegularClassBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirRegularClassBuilder.kt index e0edbb9b1ea..815791c8499 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirRegularClassBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirRegularClassBuilder.kt @@ -13,6 +13,7 @@ import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.declarations.DeprecationsProvider import org.jetbrains.kotlin.fir.declarations.FirContextReceiver import org.jetbrains.kotlin.fir.declarations.FirDeclaration @@ -71,7 +72,7 @@ open class FirRegularClassBuilder : FirClassBuilder, FirTypeParameterRefsOwnerBu deprecationsProvider, classKind, declarations, - annotations, + annotations.toMutableOrEmpty(), scopeProvider, name, symbol, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirScriptBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirScriptBuilder.kt index c2f443e58ab..6a881a5355e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirScriptBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirScriptBuilder.kt @@ -12,6 +12,7 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.declarations.FirContextReceiver import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin @@ -46,7 +47,7 @@ class FirScriptBuilder : FirAnnotationContainerBuilder { return FirScriptImpl( source, resolvePhase, - annotations, + annotations.toMutableOrEmpty(), moduleData, origin, attributes, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirSimpleFunctionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirSimpleFunctionBuilder.kt index 7586ba448d8..3599403897e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirSimpleFunctionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirSimpleFunctionBuilder.kt @@ -12,6 +12,7 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.contracts.FirContractDescription import org.jetbrains.kotlin.fir.contracts.impl.FirEmptyContractDescription import org.jetbrains.kotlin.fir.declarations.DeprecationsProvider @@ -84,7 +85,7 @@ open class FirSimpleFunctionBuilder : FirFunctionBuilder, FirTypeParametersOwner contractDescription, name, symbol, - annotations, + annotations.toMutableOrEmpty(), typeParameters, ) } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirTypeAliasBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirTypeAliasBuilder.kt index d3510bb1e04..9c1bd3774ed 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirTypeAliasBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirTypeAliasBuilder.kt @@ -12,6 +12,7 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.declarations.DeprecationsProvider import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin @@ -62,7 +63,7 @@ class FirTypeAliasBuilder : FirDeclarationBuilder, FirTypeParametersOwnerBuilder name, symbol, expandedTypeRef, - annotations, + annotations.toMutableOrEmpty(), ) } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirTypeParameterBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirTypeParameterBuilder.kt index 285aaaee01e..809e16223a0 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirTypeParameterBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirTypeParameterBuilder.kt @@ -12,6 +12,7 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin import org.jetbrains.kotlin.fir.declarations.FirResolvePhase @@ -58,7 +59,7 @@ class FirTypeParameterBuilder : FirAnnotationContainerBuilder { variance, isReified, bounds, - annotations, + annotations.toMutableOrEmpty(), ) } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirValueParameterBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirValueParameterBuilder.kt index 3c98c0f3540..c12cf9eb915 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirValueParameterBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirValueParameterBuilder.kt @@ -12,6 +12,7 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.declarations.DeprecationsProvider import org.jetbrains.kotlin.fir.declarations.FirBackingField import org.jetbrains.kotlin.fir.declarations.FirContextReceiver @@ -78,7 +79,7 @@ open class FirValueParameterBuilder : FirAnnotationContainerBuilder { contextReceivers, name, backingField, - annotations, + annotations.toMutableOrEmpty(), symbol, defaultValue, containingFunctionSymbol, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousFunctionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousFunctionImpl.kt index 81a8b19d02c..48f3c924599 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousFunctionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousFunctionImpl.kt @@ -31,6 +31,8 @@ import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -39,7 +41,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirAnonymousFunctionImpl( override val source: KtSourceElement?, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override val moduleData: FirModuleData, override val origin: FirDeclarationOrigin, override val attributes: FirDeclarationAttributes, @@ -137,6 +139,10 @@ internal class FirAnonymousFunctionImpl( resolvePhase = newResolvePhase } + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } + override fun replaceReturnTypeRef(newReturnTypeRef: FirTypeRef) { returnTypeRef = newReturnTypeRef } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousInitializerImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousInitializerImpl.kt index dfd6acbbcea..7688224b580 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousInitializerImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousInitializerImpl.kt @@ -19,6 +19,8 @@ import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirAnonymousInitializerSymbol import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -62,6 +64,8 @@ internal class FirAnonymousInitializerImpl( resolvePhase = newResolvePhase } + override fun replaceAnnotations(newAnnotations: List) {} + override fun replaceControlFlowGraphReference(newControlFlowGraphReference: FirControlFlowGraphReference?) { controlFlowGraphReference = newControlFlowGraphReference } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousObjectImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousObjectImpl.kt index 6c15784c3e0..1f862a70ea5 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousObjectImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousObjectImpl.kt @@ -24,6 +24,8 @@ import org.jetbrains.kotlin.fir.scopes.FirScopeProvider import org.jetbrains.kotlin.fir.symbols.impl.FirAnonymousObjectSymbol import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -43,7 +45,7 @@ internal class FirAnonymousObjectImpl( override val classKind: ClassKind, override val superTypeRefs: MutableList, override val declarations: MutableList, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override val scopeProvider: FirScopeProvider, override val symbol: FirAnonymousObjectSymbol, ) : FirAnonymousObject() { @@ -110,6 +112,10 @@ internal class FirAnonymousObjectImpl( superTypeRefs.addAll(newSuperTypeRefs) } + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } + override fun replaceControlFlowGraphReference(newControlFlowGraphReference: FirControlFlowGraphReference?) { controlFlowGraphReference = newControlFlowGraphReference } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirBackingFieldImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirBackingFieldImpl.kt index a86d132e2ce..b8b42f9ffc3 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirBackingFieldImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirBackingFieldImpl.kt @@ -29,6 +29,8 @@ import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -58,7 +60,7 @@ open class FirBackingFieldImpl @FirImplementationDetail constructor( override val symbol: FirBackingFieldSymbol, override val propertySymbol: FirPropertySymbol, override var initializer: FirExpression?, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override val typeParameters: MutableList, override var status: FirDeclarationStatus, ) : FirBackingField() { @@ -182,4 +184,8 @@ open class FirBackingFieldImpl @FirImplementationDetail constructor( override fun replaceInitializer(newInitializer: FirExpression?) { initializer = newInitializer } + + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirConstructorImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirConstructorImpl.kt index 38f39663f0b..a0bbbca4c98 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirConstructorImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirConstructorImpl.kt @@ -28,6 +28,8 @@ import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -50,7 +52,7 @@ internal class FirConstructorImpl( override val dispatchReceiverType: ConeSimpleKotlinType?, override val contextReceivers: MutableList, override val valueParameters: MutableList, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override val symbol: FirConstructorSymbol, override var delegatedConstructor: FirDelegatedConstructorCall?, override var body: FirBlock?, @@ -159,6 +161,10 @@ internal class FirConstructorImpl( valueParameters.addAll(newValueParameters) } + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } + override fun replaceDelegatedConstructor(newDelegatedConstructor: FirDelegatedConstructorCall?) { delegatedConstructor = newDelegatedConstructor } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultSetterValueParameter.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultSetterValueParameter.kt index 4067576821c..2a2377d87a3 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultSetterValueParameter.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultSetterValueParameter.kt @@ -31,6 +31,8 @@ import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -57,7 +59,7 @@ internal class FirDefaultSetterValueParameter( override var getter: FirPropertyAccessor?, override var setter: FirPropertyAccessor?, override var backingField: FirBackingField?, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override val symbol: FirValueParameterSymbol, override var defaultValue: FirExpression?, override val containingFunctionSymbol: FirFunctionSymbol<*>, @@ -192,6 +194,10 @@ internal class FirDefaultSetterValueParameter( setter = newSetter } + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } + override fun replaceControlFlowGraphReference(newControlFlowGraphReference: FirControlFlowGraphReference?) { controlFlowGraphReference = newControlFlowGraphReference } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirEnumEntryImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirEnumEntryImpl.kt index a1cfaf0592f..e391ba3343a 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirEnumEntryImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirEnumEntryImpl.kt @@ -28,6 +28,8 @@ import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -51,7 +53,7 @@ internal class FirEnumEntryImpl( override val name: Name, override var initializer: FirExpression?, override var backingField: FirBackingField?, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override val symbol: FirEnumEntrySymbol, ) : FirEnumEntry() { override val receiverParameter: FirReceiverParameter? get() = null @@ -163,4 +165,8 @@ internal class FirEnumEntryImpl( override fun replaceGetter(newGetter: FirPropertyAccessor?) {} override fun replaceSetter(newSetter: FirPropertyAccessor?) {} + + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirErrorFunctionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirErrorFunctionImpl.kt index 1ff2c8ed13d..7459c445daf 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirErrorFunctionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirErrorFunctionImpl.kt @@ -30,6 +30,8 @@ import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.impl.FirErrorTypeRefImpl import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -40,7 +42,7 @@ internal class FirErrorFunctionImpl( override val source: KtSourceElement?, @Volatile override var resolvePhase: FirResolvePhase, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override val moduleData: FirModuleData, override val origin: FirDeclarationOrigin, override val attributes: FirDeclarationAttributes, @@ -118,6 +120,10 @@ internal class FirErrorFunctionImpl( resolvePhase = newResolvePhase } + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } + override fun replaceReturnTypeRef(newReturnTypeRef: FirTypeRef) { returnTypeRef = newReturnTypeRef } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirErrorPropertyImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirErrorPropertyImpl.kt index fa1749ee4d8..a17add26729 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirErrorPropertyImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirErrorPropertyImpl.kt @@ -31,6 +31,8 @@ import org.jetbrains.kotlin.fir.types.impl.FirErrorTypeRefImpl import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -50,7 +52,7 @@ internal class FirErrorPropertyImpl( override val contextReceivers: MutableList, override val name: Name, override var backingField: FirBackingField?, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override val diagnostic: ConeDiagnostic, override val symbol: FirErrorPropertySymbol, ) : FirErrorProperty() { @@ -159,4 +161,8 @@ internal class FirErrorPropertyImpl( override fun replaceGetter(newGetter: FirPropertyAccessor?) {} override fun replaceSetter(newSetter: FirPropertyAccessor?) {} + + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirFieldImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirFieldImpl.kt index 99398bb2275..32a9b0b6d9e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirFieldImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirFieldImpl.kt @@ -30,6 +30,8 @@ import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -54,7 +56,7 @@ class FirFieldImpl @FirImplementationDetail constructor( override var initializer: FirExpression?, override val isVar: Boolean, override var backingField: FirBackingField?, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override val symbol: FirFieldSymbol, ) : FirField() { override val receiverParameter: FirReceiverParameter? get() = null @@ -169,6 +171,10 @@ class FirFieldImpl @FirImplementationDetail constructor( override fun replaceSetter(newSetter: FirPropertyAccessor?) {} + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } + override fun replaceControlFlowGraphReference(newControlFlowGraphReference: FirControlFlowGraphReference?) { controlFlowGraphReference = newControlFlowGraphReference } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirFileImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirFileImpl.kt index d2e6bf2bf9b..88ba3844dda 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirFileImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirFileImpl.kt @@ -22,6 +22,8 @@ import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.symbols.impl.FirFileSymbol import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -87,4 +89,6 @@ internal class FirFileImpl( override fun replaceResolvePhase(newResolvePhase: FirResolvePhase) { resolvePhase = newResolvePhase } + + override fun replaceAnnotations(newAnnotations: List) {} } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPrimaryConstructor.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPrimaryConstructor.kt index b92202eadeb..0bae8beeb45 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPrimaryConstructor.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPrimaryConstructor.kt @@ -29,6 +29,8 @@ import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -51,7 +53,7 @@ class FirPrimaryConstructor @FirImplementationDetail constructor( override val dispatchReceiverType: ConeSimpleKotlinType?, override val contextReceivers: MutableList, override val valueParameters: MutableList, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override val symbol: FirConstructorSymbol, override var delegatedConstructor: FirDelegatedConstructorCall?, override var body: FirBlock?, @@ -160,6 +162,10 @@ class FirPrimaryConstructor @FirImplementationDetail constructor( valueParameters.addAll(newValueParameters) } + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } + override fun replaceDelegatedConstructor(newDelegatedConstructor: FirDelegatedConstructorCall?) { delegatedConstructor = newDelegatedConstructor } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyAccessorImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyAccessorImpl.kt index effd22ba76f..49094f20fa9 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyAccessorImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyAccessorImpl.kt @@ -31,6 +31,8 @@ import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -56,7 +58,7 @@ open class FirPropertyAccessorImpl @FirImplementationDetail constructor( override val symbol: FirPropertyAccessorSymbol, override val propertySymbol: FirPropertySymbol, override val isGetter: Boolean, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override val typeParameters: MutableList, ) : FirPropertyAccessor() { override val receiverParameter: FirReceiverParameter? get() = null @@ -166,4 +168,8 @@ open class FirPropertyAccessorImpl @FirImplementationDetail constructor( override fun replaceContractDescription(newContractDescription: FirContractDescription) { contractDescription = newContractDescription } + + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyImpl.kt index 2b699527334..34faa332293 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyImpl.kt @@ -32,6 +32,8 @@ import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -58,7 +60,7 @@ internal class FirPropertyImpl( override var getter: FirPropertyAccessor?, override var setter: FirPropertyAccessor?, override var backingField: FirBackingField?, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override val contextReceivers: MutableList, override val symbol: FirPropertySymbol, override val delegateFieldSymbol: FirDelegateFieldSymbol?, @@ -193,6 +195,10 @@ internal class FirPropertyImpl( setter = newSetter } + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } + override fun replaceControlFlowGraphReference(newControlFlowGraphReference: FirControlFlowGraphReference?) { controlFlowGraphReference = newControlFlowGraphReference } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirReceiverParameterImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirReceiverParameterImpl.kt index cbb40c5bc9b..366ae688706 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirReceiverParameterImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirReceiverParameterImpl.kt @@ -12,6 +12,8 @@ import org.jetbrains.kotlin.fir.declarations.FirReceiverParameter import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -21,7 +23,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirReceiverParameterImpl( override val source: KtSourceElement?, override var typeRef: FirTypeRef, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, ) : FirReceiverParameter() { override fun acceptChildren(visitor: FirVisitor, data: D) { typeRef.accept(visitor, data) @@ -47,4 +49,8 @@ internal class FirReceiverParameterImpl( override fun replaceTypeRef(newTypeRef: FirTypeRef) { typeRef = newTypeRef } + + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirRegularClassImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirRegularClassImpl.kt index 4881be81954..b53f88a7f96 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirRegularClassImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirRegularClassImpl.kt @@ -26,6 +26,8 @@ import org.jetbrains.kotlin.fir.symbols.impl.FirRegularClassSymbol import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -44,7 +46,7 @@ internal class FirRegularClassImpl( override var deprecationsProvider: DeprecationsProvider, override val classKind: ClassKind, override val declarations: MutableList, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override val scopeProvider: FirScopeProvider, override val name: Name, override val symbol: FirRegularClassSymbol, @@ -113,6 +115,10 @@ internal class FirRegularClassImpl( deprecationsProvider = newDeprecationsProvider } + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } + override fun replaceControlFlowGraphReference(newControlFlowGraphReference: FirControlFlowGraphReference?) { controlFlowGraphReference = newControlFlowGraphReference } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirScriptImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirScriptImpl.kt index cdf7f67ec68..a165893f178 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirScriptImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirScriptImpl.kt @@ -19,6 +19,8 @@ import org.jetbrains.kotlin.fir.expressions.FirStatement import org.jetbrains.kotlin.fir.symbols.impl.FirScriptSymbol import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -29,7 +31,7 @@ internal class FirScriptImpl( override val source: KtSourceElement?, @Volatile override var resolvePhase: FirResolvePhase, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override val moduleData: FirModuleData, override val origin: FirDeclarationOrigin, override val attributes: FirDeclarationAttributes, @@ -68,4 +70,8 @@ internal class FirScriptImpl( override fun replaceResolvePhase(newResolvePhase: FirResolvePhase) { resolvePhase = newResolvePhase } + + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirSimpleFunctionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirSimpleFunctionImpl.kt index a9d96f938e1..f4d6bc16854 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirSimpleFunctionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirSimpleFunctionImpl.kt @@ -29,6 +29,8 @@ import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -54,7 +56,7 @@ internal class FirSimpleFunctionImpl( override var contractDescription: FirContractDescription, override val name: Name, override val symbol: FirNamedFunctionSymbol, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override val typeParameters: MutableList, ) : FirSimpleFunction() { override var controlFlowGraphReference: FirControlFlowGraphReference? = null @@ -167,4 +169,8 @@ internal class FirSimpleFunctionImpl( override fun replaceContractDescription(newContractDescription: FirContractDescription) { contractDescription = newContractDescription } + + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirTypeAliasImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirTypeAliasImpl.kt index 2112812c025..20bdf8291ad 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirTypeAliasImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirTypeAliasImpl.kt @@ -21,6 +21,8 @@ import org.jetbrains.kotlin.fir.symbols.impl.FirTypeAliasSymbol import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -40,7 +42,7 @@ internal class FirTypeAliasImpl( override val name: Name, override val symbol: FirTypeAliasSymbol, override var expandedTypeRef: FirTypeRef, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, ) : FirTypeAlias() { init { symbol.bind(this) @@ -92,4 +94,8 @@ internal class FirTypeAliasImpl( override fun replaceExpandedTypeRef(newExpandedTypeRef: FirTypeRef) { expandedTypeRef = newExpandedTypeRef } + + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirTypeParameterImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirTypeParameterImpl.kt index 0a39d9670d4..e6baed74a99 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirTypeParameterImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirTypeParameterImpl.kt @@ -20,6 +20,8 @@ import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.types.Variance import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -39,7 +41,7 @@ internal class FirTypeParameterImpl( override val variance: Variance, override val isReified: Boolean, override val bounds: MutableList, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, ) : FirTypeParameter() { init { symbol.bind(this) @@ -69,4 +71,8 @@ internal class FirTypeParameterImpl( bounds.clear() bounds.addAll(newBounds) } + + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirValueParameterImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirValueParameterImpl.kt index b3329f51be1..a4b352c97b2 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirValueParameterImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirValueParameterImpl.kt @@ -31,6 +31,8 @@ import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -51,7 +53,7 @@ internal class FirValueParameterImpl( override val contextReceivers: MutableList, override val name: Name, override var backingField: FirBackingField?, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override val symbol: FirValueParameterSymbol, override var defaultValue: FirExpression?, override val containingFunctionSymbol: FirFunctionSymbol<*>, @@ -169,6 +171,10 @@ internal class FirValueParameterImpl( override fun replaceSetter(newSetter: FirPropertyAccessor?) {} + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } + override fun replaceControlFlowGraphReference(newControlFlowGraphReference: FirControlFlowGraphReference?) { controlFlowGraphReference = newControlFlowGraphReference } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnnotation.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnnotation.kt index 5a05f59f2de..801b2906d7c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnnotation.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnnotation.kt @@ -34,6 +34,8 @@ abstract class FirAnnotation : FirExpression() { abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract fun replaceAnnotationTypeRef(newAnnotationTypeRef: FirTypeRef) abstract fun replaceArgumentMapping(newArgumentMapping: FirAnnotationArgumentMapping) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnnotationCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnnotationCall.kt index a4839ada373..db34672d043 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnnotationCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnnotationCall.kt @@ -38,6 +38,8 @@ abstract class FirAnnotationCall : FirAnnotation(), FirCall, FirResolvable { abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun replaceAnnotationTypeRef(newAnnotationTypeRef: FirTypeRef) abstract override fun replaceTypeArguments(newTypeArguments: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnonymousFunctionExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnonymousFunctionExpression.kt index 8be93193e12..f236779e434 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnonymousFunctionExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnonymousFunctionExpression.kt @@ -30,6 +30,8 @@ abstract class FirAnonymousFunctionExpression : FirExpression() { abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirAnonymousFunctionExpression abstract fun transformAnonymousFunction(transformer: FirTransformer, data: D): FirAnonymousFunctionExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnonymousObjectExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnonymousObjectExpression.kt index 767bba1b4c8..2900cc82575 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnonymousObjectExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnonymousObjectExpression.kt @@ -30,6 +30,8 @@ abstract class FirAnonymousObjectExpression : FirExpression() { abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirAnonymousObjectExpression abstract fun transformAnonymousObject(transformer: FirTransformer, data: D): FirAnonymousObjectExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirArrayOfCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirArrayOfCall.kt index 2d0b169fcb6..2f4c7527e9b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirArrayOfCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirArrayOfCall.kt @@ -29,6 +29,8 @@ abstract class FirArrayOfCall : FirExpression(), FirCall { abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun replaceArgumentList(newArgumentList: FirArgumentList) abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirArrayOfCall diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAssignmentOperatorStatement.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAssignmentOperatorStatement.kt index b29d4db7b7c..6977f0f3749 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAssignmentOperatorStatement.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAssignmentOperatorStatement.kt @@ -28,6 +28,8 @@ abstract class FirAssignmentOperatorStatement : FirPureAbstractElement(), FirSta override fun transform(transformer: FirTransformer, data: D): E = transformer.transformAssignmentOperatorStatement(this, data) as E + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirAssignmentOperatorStatement abstract fun transformLeftArgument(transformer: FirTransformer, data: D): FirAssignmentOperatorStatement diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAugmentedArraySetCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAugmentedArraySetCall.kt index e8d8f22db39..bd6f08848f6 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAugmentedArraySetCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAugmentedArraySetCall.kt @@ -31,6 +31,8 @@ abstract class FirAugmentedArraySetCall : FirPureAbstractElement(), FirStatement override fun transform(transformer: FirTransformer, data: D): E = transformer.transformAugmentedArraySetCall(this, data) as E + abstract override fun replaceAnnotations(newAnnotations: List) + abstract fun replaceCalleeReference(newCalleeReference: FirReference) abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirAugmentedArraySetCall diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBinaryLogicExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBinaryLogicExpression.kt index 8192dfd3be1..85cdf97eb49 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBinaryLogicExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBinaryLogicExpression.kt @@ -31,6 +31,8 @@ abstract class FirBinaryLogicExpression : FirExpression() { abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirBinaryLogicExpression abstract fun transformLeftOperand(transformer: FirTransformer, data: D): FirBinaryLogicExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBlock.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBlock.kt index 4bbd29910f2..1f3d3c97260 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBlock.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBlock.kt @@ -27,6 +27,8 @@ abstract class FirBlock : FirExpression() { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformBlock(this, data) as E + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirBlock diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBreakExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBreakExpression.kt index 0b602088cb2..ab19eabacdf 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBreakExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBreakExpression.kt @@ -30,5 +30,7 @@ abstract class FirBreakExpression : FirLoopJump() { abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirBreakExpression } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCall.kt index a53500f7b22..7808318fe16 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCall.kt @@ -25,6 +25,8 @@ sealed interface FirCall : FirStatement { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformCall(this, data) as E + override fun replaceAnnotations(newAnnotations: List) + fun replaceArgumentList(newArgumentList: FirArgumentList) override fun transformAnnotations(transformer: FirTransformer, data: D): FirCall diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCallableReferenceAccess.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCallableReferenceAccess.kt index f4e48d42852..5b16d6a7aeb 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCallableReferenceAccess.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCallableReferenceAccess.kt @@ -42,6 +42,8 @@ abstract class FirCallableReferenceAccess : FirQualifiedAccessExpression() { abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun replaceContextReceiverArguments(newContextReceiverArguments: List) abstract override fun replaceTypeArguments(newTypeArguments: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCheckNotNullCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCheckNotNullCall.kt index 1a893206594..6f174ac9706 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCheckNotNullCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCheckNotNullCall.kt @@ -31,6 +31,8 @@ abstract class FirCheckNotNullCall : FirExpression(), FirCall, FirResolvable { abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun replaceArgumentList(newArgumentList: FirArgumentList) abstract override fun replaceCalleeReference(newCalleeReference: FirReference) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCheckedSafeCallSubject.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCheckedSafeCallSubject.kt index 29ac9ef5df8..bfb0bfef59a 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCheckedSafeCallSubject.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCheckedSafeCallSubject.kt @@ -30,5 +30,7 @@ abstract class FirCheckedSafeCallSubject : FirExpression() { abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirCheckedSafeCallSubject } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirClassReferenceExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirClassReferenceExpression.kt index 2f2b7b1cbbf..3a3604a56fe 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirClassReferenceExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirClassReferenceExpression.kt @@ -29,5 +29,7 @@ abstract class FirClassReferenceExpression : FirExpression() { abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirClassReferenceExpression } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirComparisonExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirComparisonExpression.kt index efead9c03f1..38d50fd2d52 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirComparisonExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirComparisonExpression.kt @@ -30,5 +30,7 @@ abstract class FirComparisonExpression : FirExpression() { abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirComparisonExpression } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirComponentCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirComponentCall.kt index a47ded55f7d..6223a1973ad 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirComponentCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirComponentCall.kt @@ -44,6 +44,8 @@ abstract class FirComponentCall : FirFunctionCall() { abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun replaceContextReceiverArguments(newContextReceiverArguments: List) abstract override fun replaceTypeArguments(newTypeArguments: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirConstExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirConstExpression.kt index ed0a68124ec..9bcffbb2a37 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirConstExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirConstExpression.kt @@ -31,6 +31,8 @@ abstract class FirConstExpression : FirExpression() { abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract fun replaceKind(newKind: ConstantValueKind) abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirConstExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirContinueExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirContinueExpression.kt index 76ee58048fb..bf70ae5006f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirContinueExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirContinueExpression.kt @@ -30,5 +30,7 @@ abstract class FirContinueExpression : FirLoopJump() { abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirContinueExpression } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirDelegatedConstructorCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirDelegatedConstructorCall.kt index 39d35467bff..c2d50b7b88b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirDelegatedConstructorCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirDelegatedConstructorCall.kt @@ -34,6 +34,8 @@ abstract class FirDelegatedConstructorCall : FirPureAbstractElement(), FirResolv override fun transform(transformer: FirTransformer, data: D): E = transformer.transformDelegatedConstructorCall(this, data) as E + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun replaceArgumentList(newArgumentList: FirArgumentList) abstract override fun replaceContextReceiverArguments(newContextReceiverArguments: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirDoWhileLoop.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirDoWhileLoop.kt index 5b983f2217b..38e6c743ee8 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirDoWhileLoop.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirDoWhileLoop.kt @@ -28,6 +28,8 @@ abstract class FirDoWhileLoop : FirLoop() { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformDoWhileLoop(this, data) as E + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirDoWhileLoop abstract override fun transformBlock(transformer: FirTransformer, data: D): FirDoWhileLoop diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirElvisExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirElvisExpression.kt index d143b58ffe8..1d99791f5c1 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirElvisExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirElvisExpression.kt @@ -32,6 +32,8 @@ abstract class FirElvisExpression : FirExpression(), FirResolvable { abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun replaceCalleeReference(newCalleeReference: FirReference) abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirElvisExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirEqualityOperatorCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirEqualityOperatorCall.kt index dfab8670368..ffcda6b160e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirEqualityOperatorCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirEqualityOperatorCall.kt @@ -30,6 +30,8 @@ abstract class FirEqualityOperatorCall : FirExpression(), FirCall { abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun replaceArgumentList(newArgumentList: FirArgumentList) abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirEqualityOperatorCall diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorAnnotationCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorAnnotationCall.kt index ec726ead69e..3d79771fc35 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorAnnotationCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorAnnotationCall.kt @@ -41,6 +41,8 @@ abstract class FirErrorAnnotationCall : FirAnnotationCall(), FirDiagnosticHolder abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun replaceAnnotationTypeRef(newAnnotationTypeRef: FirTypeRef) abstract override fun replaceTypeArguments(newTypeArguments: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorExpression.kt index 3b6bd77cf81..ce4683ffb7b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorExpression.kt @@ -33,5 +33,7 @@ abstract class FirErrorExpression : FirExpression(), FirDiagnosticHolder { abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirErrorExpression } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorLoop.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorLoop.kt index 5e9775fe02c..3b5606e91a1 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorLoop.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorLoop.kt @@ -31,6 +31,8 @@ abstract class FirErrorLoop : FirLoop(), FirDiagnosticHolder { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformErrorLoop(this, data) as E + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirErrorLoop abstract override fun transformBlock(transformer: FirTransformer, data: D): FirErrorLoop diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorResolvedQualifier.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorResolvedQualifier.kt index 2ed28e52e74..b075cb41650 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorResolvedQualifier.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorResolvedQualifier.kt @@ -43,6 +43,8 @@ abstract class FirErrorResolvedQualifier : FirResolvedQualifier(), FirDiagnostic abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun replaceIsNullableLHSForCallableReference(newIsNullableLHSForCallableReference: Boolean) abstract override fun replaceResolvedToCompanionObject(newResolvedToCompanionObject: Boolean) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirExpression.kt index ce1035daebd..dc9b5eeffbd 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirExpression.kt @@ -29,5 +29,7 @@ abstract class FirExpression : FirPureAbstractElement(), FirStatement { abstract fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirExpression } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirFunctionCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirFunctionCall.kt index 4299b72e0ca..20190d7e6d1 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirFunctionCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirFunctionCall.kt @@ -43,6 +43,8 @@ abstract class FirFunctionCall : FirQualifiedAccessExpression(), FirCall { abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun replaceContextReceiverArguments(newContextReceiverArguments: List) abstract override fun replaceTypeArguments(newTypeArguments: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirGetClassCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirGetClassCall.kt index 8cd15d9fcd0..54994f3227f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirGetClassCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirGetClassCall.kt @@ -30,6 +30,8 @@ abstract class FirGetClassCall : FirExpression(), FirCall { abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun replaceArgumentList(newArgumentList: FirArgumentList) abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirGetClassCall diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirImplicitInvokeCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirImplicitInvokeCall.kt index 6b4cb170321..737d079c29e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirImplicitInvokeCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirImplicitInvokeCall.kt @@ -43,6 +43,8 @@ abstract class FirImplicitInvokeCall : FirFunctionCall() { abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun replaceContextReceiverArguments(newContextReceiverArguments: List) abstract override fun replaceTypeArguments(newTypeArguments: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirIntegerLiteralOperatorCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirIntegerLiteralOperatorCall.kt index 06d05e6328a..2e3f4080765 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirIntegerLiteralOperatorCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirIntegerLiteralOperatorCall.kt @@ -43,6 +43,8 @@ abstract class FirIntegerLiteralOperatorCall : FirFunctionCall() { abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun replaceContextReceiverArguments(newContextReceiverArguments: List) abstract override fun replaceTypeArguments(newTypeArguments: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirJump.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirJump.kt index e7b0d123d76..1359450c28e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirJump.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirJump.kt @@ -31,5 +31,7 @@ sealed class FirJump : FirExpression() { abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirJump } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLambdaArgumentExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLambdaArgumentExpression.kt index 8ed05c2dc52..36f511e93c1 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLambdaArgumentExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLambdaArgumentExpression.kt @@ -30,6 +30,8 @@ abstract class FirLambdaArgumentExpression : FirWrappedArgumentExpression() { abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun replaceExpression(newExpression: FirExpression) abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirLambdaArgumentExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLoop.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLoop.kt index 7ddbdfda60b..669822be693 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLoop.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLoop.kt @@ -30,6 +30,8 @@ sealed class FirLoop : FirPureAbstractElement(), FirStatement, FirTargetElement override fun transform(transformer: FirTransformer, data: D): E = transformer.transformLoop(this, data) as E + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirLoop abstract fun transformBlock(transformer: FirTransformer, data: D): FirLoop diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLoopJump.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLoopJump.kt index 34ac4d9bb15..f904b355435 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLoopJump.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLoopJump.kt @@ -30,5 +30,7 @@ abstract class FirLoopJump : FirJump() { abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirLoopJump } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirNamedArgumentExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirNamedArgumentExpression.kt index 3e4e2ee8ea4..6d85ec8f82a 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirNamedArgumentExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirNamedArgumentExpression.kt @@ -32,6 +32,8 @@ abstract class FirNamedArgumentExpression : FirWrappedArgumentExpression() { abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun replaceExpression(newExpression: FirExpression) abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirNamedArgumentExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirPropertyAccessExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirPropertyAccessExpression.kt index 971e4a3ff9a..4f82eebf63b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirPropertyAccessExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirPropertyAccessExpression.kt @@ -42,6 +42,8 @@ abstract class FirPropertyAccessExpression : FirQualifiedAccessExpression() { abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun replaceCalleeReference(newCalleeReference: FirReference) abstract override fun replaceContextReceiverArguments(newContextReceiverArguments: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirQualifiedAccess.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirQualifiedAccess.kt index 46cad3bc674..1dc332458d8 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirQualifiedAccess.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirQualifiedAccess.kt @@ -35,6 +35,8 @@ interface FirQualifiedAccess : FirResolvable, FirStatement, FirContextReceiverAr override fun replaceCalleeReference(newCalleeReference: FirReference) + override fun replaceAnnotations(newAnnotations: List) + override fun replaceContextReceiverArguments(newContextReceiverArguments: List) fun replaceTypeArguments(newTypeArguments: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirQualifiedAccessExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirQualifiedAccessExpression.kt index 750e35ce5cd..41d4bf1df83 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirQualifiedAccessExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirQualifiedAccessExpression.kt @@ -40,6 +40,8 @@ abstract class FirQualifiedAccessExpression : FirExpression(), FirQualifiedAcces abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun replaceCalleeReference(newCalleeReference: FirReference) abstract override fun replaceContextReceiverArguments(newContextReceiverArguments: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirQualifiedErrorAccessExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirQualifiedErrorAccessExpression.kt index cbf1ccdc629..cfd5ab09b8c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirQualifiedErrorAccessExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirQualifiedErrorAccessExpression.kt @@ -33,5 +33,7 @@ abstract class FirQualifiedErrorAccessExpression : FirExpression(), FirDiagnosti abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirQualifiedErrorAccessExpression } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirResolvedQualifier.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirResolvedQualifier.kt index f6ab3782301..b965c882fee 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirResolvedQualifier.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirResolvedQualifier.kt @@ -41,6 +41,8 @@ abstract class FirResolvedQualifier : FirExpression() { abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract fun replaceIsNullableLHSForCallableReference(newIsNullableLHSForCallableReference: Boolean) abstract fun replaceResolvedToCompanionObject(newResolvedToCompanionObject: Boolean) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirResolvedReifiedParameterReference.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirResolvedReifiedParameterReference.kt index cd566467c8c..ff12b4137d3 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirResolvedReifiedParameterReference.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirResolvedReifiedParameterReference.kt @@ -30,5 +30,7 @@ abstract class FirResolvedReifiedParameterReference : FirExpression() { abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirResolvedReifiedParameterReference } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirReturnExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirReturnExpression.kt index 1d1e23710e8..2484b8c0872 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirReturnExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirReturnExpression.kt @@ -32,6 +32,8 @@ abstract class FirReturnExpression : FirJump() { abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirReturnExpression abstract fun transformResult(transformer: FirTransformer, data: D): FirReturnExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirSafeCallExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirSafeCallExpression.kt index 6b2c248541f..2f5a838b65f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirSafeCallExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirSafeCallExpression.kt @@ -32,6 +32,8 @@ abstract class FirSafeCallExpression : FirExpression() { abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract fun replaceSelector(newSelector: FirStatement) abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirSafeCallExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirSmartCastExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirSmartCastExpression.kt index ca899413808..f344e1108ad 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirSmartCastExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirSmartCastExpression.kt @@ -34,6 +34,8 @@ abstract class FirSmartCastExpression : FirExpression() { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformSmartCastExpression(this, data) as E + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirSmartCastExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirSpreadArgumentExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirSpreadArgumentExpression.kt index 62e8ea7cf67..f72be3c5624 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirSpreadArgumentExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirSpreadArgumentExpression.kt @@ -30,6 +30,8 @@ abstract class FirSpreadArgumentExpression : FirWrappedArgumentExpression() { abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun replaceExpression(newExpression: FirExpression) abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirSpreadArgumentExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirStatement.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirStatement.kt index b5e116affdb..e0febdc927b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirStatement.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirStatement.kt @@ -25,5 +25,7 @@ interface FirStatement : FirAnnotationContainer { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformStatement(this, data) as E + override fun replaceAnnotations(newAnnotations: List) + override fun transformAnnotations(transformer: FirTransformer, data: D): FirStatement } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirStringConcatenationCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirStringConcatenationCall.kt index fa57fe1624f..a40d01a3d32 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirStringConcatenationCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirStringConcatenationCall.kt @@ -27,6 +27,8 @@ abstract class FirStringConcatenationCall : FirCall, FirExpression() { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformStringConcatenationCall(this, data) as E + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun replaceArgumentList(newArgumentList: FirArgumentList) abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirThisReceiverExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirThisReceiverExpression.kt index 9e94c1ec203..b888178ed74 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirThisReceiverExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirThisReceiverExpression.kt @@ -42,6 +42,8 @@ abstract class FirThisReceiverExpression : FirQualifiedAccessExpression() { abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun replaceContextReceiverArguments(newContextReceiverArguments: List) abstract override fun replaceTypeArguments(newTypeArguments: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirThrowExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirThrowExpression.kt index c455775fc08..36f16cd3d2d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirThrowExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirThrowExpression.kt @@ -29,5 +29,7 @@ abstract class FirThrowExpression : FirExpression() { abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirThrowExpression } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirTryExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirTryExpression.kt index 2fc5e1856c0..00934178804 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirTryExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirTryExpression.kt @@ -33,6 +33,8 @@ abstract class FirTryExpression : FirExpression(), FirResolvable { abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun replaceCalleeReference(newCalleeReference: FirReference) abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirTryExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirTypeOperatorCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirTypeOperatorCall.kt index 1e979b3506f..8d6b051ca0a 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirTypeOperatorCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirTypeOperatorCall.kt @@ -31,6 +31,8 @@ abstract class FirTypeOperatorCall : FirExpression(), FirCall { abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun replaceArgumentList(newArgumentList: FirArgumentList) abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirTypeOperatorCall diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirVarargArgumentsExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirVarargArgumentsExpression.kt index 58fe73789ce..d30f210860f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirVarargArgumentsExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirVarargArgumentsExpression.kt @@ -30,5 +30,7 @@ abstract class FirVarargArgumentsExpression : FirExpression() { abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirVarargArgumentsExpression } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirVariableAssignment.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirVariableAssignment.kt index b238f303d8e..cc1d32685b6 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirVariableAssignment.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirVariableAssignment.kt @@ -40,6 +40,8 @@ abstract class FirVariableAssignment : FirPureAbstractElement(), FirQualifiedAcc abstract override fun replaceCalleeReference(newCalleeReference: FirReference) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun replaceContextReceiverArguments(newContextReceiverArguments: List) abstract override fun replaceTypeArguments(newTypeArguments: List) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhenExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhenExpression.kt index ba29801d1c6..84cac1299a0 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhenExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhenExpression.kt @@ -36,6 +36,8 @@ abstract class FirWhenExpression : FirExpression(), FirResolvable { abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun replaceCalleeReference(newCalleeReference: FirReference) abstract fun replaceExhaustivenessStatus(newExhaustivenessStatus: ExhaustivenessStatus?) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhenSubjectExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhenSubjectExpression.kt index 54a0b1e7f76..00271b439a7 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhenSubjectExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhenSubjectExpression.kt @@ -30,5 +30,7 @@ abstract class FirWhenSubjectExpression : FirExpression() { abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirWhenSubjectExpression } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhileLoop.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhileLoop.kt index f29d1f478c4..77ab203f1c3 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhileLoop.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhileLoop.kt @@ -28,6 +28,8 @@ abstract class FirWhileLoop : FirLoop() { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformWhileLoop(this, data) as E + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirWhileLoop abstract override fun transformCondition(transformer: FirTransformer, data: D): FirWhileLoop diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWrappedArgumentExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWrappedArgumentExpression.kt index a122fecb691..5b2e1ffe3d8 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWrappedArgumentExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWrappedArgumentExpression.kt @@ -30,6 +30,8 @@ abstract class FirWrappedArgumentExpression : FirWrappedExpression() { abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun replaceExpression(newExpression: FirExpression) abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirWrappedArgumentExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWrappedDelegateExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWrappedDelegateExpression.kt index cb5e3d40c74..87cddaa4a88 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWrappedDelegateExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWrappedDelegateExpression.kt @@ -30,6 +30,8 @@ abstract class FirWrappedDelegateExpression : FirWrappedExpression() { abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun replaceExpression(newExpression: FirExpression) abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirWrappedDelegateExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWrappedExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWrappedExpression.kt index 4ee85168a34..f40000efa5b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWrappedExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWrappedExpression.kt @@ -29,6 +29,8 @@ abstract class FirWrappedExpression : FirExpression() { abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) + abstract override fun replaceAnnotations(newAnnotations: List) + abstract fun replaceExpression(newExpression: FirExpression) abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirWrappedExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAnnotationBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAnnotationBuilder.kt index 4446e280cd0..3dd1bd0c99f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAnnotationBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAnnotationBuilder.kt @@ -12,6 +12,7 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirAnnotationArgumentMapping import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAnnotationCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAnnotationCallBuilder.kt index 9e7ec0bc2b4..21583f415c1 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAnnotationCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAnnotationCallBuilder.kt @@ -12,6 +12,7 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirAnnotationArgumentMapping import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirArrayOfCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirArrayOfCallBuilder.kt index 25daf7a0ab9..a2d1e3e6bf0 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirArrayOfCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirArrayOfCallBuilder.kt @@ -11,6 +11,7 @@ import kotlin.contracts.* import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirArrayOfCall @@ -37,7 +38,7 @@ class FirArrayOfCallBuilder : FirCallBuilder, FirAnnotationContainerBuilder, Fir return FirArrayOfCallImpl( source, typeRef, - annotations, + annotations.toMutableOrEmpty(), argumentList, ) } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAssignmentOperatorStatementBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAssignmentOperatorStatementBuilder.kt index 461b8423691..8b2a89a78b2 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAssignmentOperatorStatementBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAssignmentOperatorStatementBuilder.kt @@ -11,6 +11,7 @@ import kotlin.contracts.* import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirAssignmentOperatorStatement import org.jetbrains.kotlin.fir.expressions.FirExpression @@ -34,7 +35,7 @@ class FirAssignmentOperatorStatementBuilder : FirAnnotationContainerBuilder { override fun build(): FirAssignmentOperatorStatement { return FirAssignmentOperatorStatementImpl( source, - annotations, + annotations.toMutableOrEmpty(), operation, leftArgument, rightArgument, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAugmentedArraySetCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAugmentedArraySetCallBuilder.kt index 4304e623b97..4c3a4019941 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAugmentedArraySetCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAugmentedArraySetCallBuilder.kt @@ -11,6 +11,7 @@ import kotlin.contracts.* import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirAugmentedArraySetCall import org.jetbrains.kotlin.fir.expressions.FirExpression @@ -39,7 +40,7 @@ class FirAugmentedArraySetCallBuilder : FirAnnotationContainerBuilder { override fun build(): FirAugmentedArraySetCall { return FirAugmentedArraySetCallImpl( source, - annotations, + annotations.toMutableOrEmpty(), lhsGetCall, rhs, operation, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBinaryLogicExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBinaryLogicExpressionBuilder.kt index 64bfe211232..99dde6aa446 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBinaryLogicExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBinaryLogicExpressionBuilder.kt @@ -11,6 +11,7 @@ import kotlin.contracts.* import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBinaryLogicExpression import org.jetbrains.kotlin.fir.expressions.FirExpression @@ -37,7 +38,7 @@ class FirBinaryLogicExpressionBuilder : FirAnnotationContainerBuilder, FirExpres override fun build(): FirBinaryLogicExpression { return FirBinaryLogicExpressionImpl( source, - annotations, + annotations.toMutableOrEmpty(), leftOperand, rightOperand, kind, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBlockBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBlockBuilder.kt index 454d2c1b18a..521f3d9ae03 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBlockBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBlockBuilder.kt @@ -11,6 +11,7 @@ import kotlin.contracts.* import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirStatement @@ -34,7 +35,7 @@ class FirBlockBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { override fun build(): FirBlock { return FirBlockImpl( source, - annotations, + annotations.toMutableOrEmpty(), statements, ) } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBreakExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBreakExpressionBuilder.kt index f832a340f42..9e31c317b71 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBreakExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBreakExpressionBuilder.kt @@ -14,6 +14,7 @@ import org.jetbrains.kotlin.fakeElement import org.jetbrains.kotlin.fir.FirTarget import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBreakExpression import org.jetbrains.kotlin.fir.expressions.FirLoop @@ -38,7 +39,7 @@ class FirBreakExpressionBuilder : FirLoopJumpBuilder, FirAnnotationContainerBuil override fun build(): FirBreakExpression { return FirBreakExpressionImpl( source, - annotations, + annotations.toMutableOrEmpty(), target, ) } 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 4ae85c66408..c4082a0de4c 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 @@ -12,6 +12,7 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirCallableReferenceAccess import org.jetbrains.kotlin.fir.expressions.FirExpression @@ -48,7 +49,7 @@ class FirCallableReferenceAccessBuilder : FirQualifiedAccessBuilder, FirAnnotati return FirCallableReferenceAccessImpl( source, typeRef, - annotations, + annotations.toMutableOrEmpty(), contextReceiverArguments, typeArguments, explicitReceiver, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCheckNotNullCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCheckNotNullCallBuilder.kt index 3a9c67970dd..68f55b3dc50 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCheckNotNullCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCheckNotNullCallBuilder.kt @@ -11,6 +11,7 @@ import kotlin.contracts.* import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirCheckNotNullCall @@ -39,7 +40,7 @@ class FirCheckNotNullCallBuilder : FirAnnotationContainerBuilder, FirExpressionB return FirCheckNotNullCallImpl( source, typeRef, - annotations, + annotations.toMutableOrEmpty(), argumentList, calleeReference, ) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCheckedSafeCallSubjectBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCheckedSafeCallSubjectBuilder.kt index c81361e65de..916d644b228 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCheckedSafeCallSubjectBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCheckedSafeCallSubjectBuilder.kt @@ -12,6 +12,7 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirExpressionRef import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirCheckedSafeCallSubject import org.jetbrains.kotlin.fir.expressions.FirExpression @@ -37,7 +38,7 @@ class FirCheckedSafeCallSubjectBuilder : FirAnnotationContainerBuilder, FirExpre return FirCheckedSafeCallSubjectImpl( source, typeRef, - annotations, + annotations.toMutableOrEmpty(), originalReceiverRef, ) } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirClassReferenceExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirClassReferenceExpressionBuilder.kt index 35f5f2e54be..3caa9c7552d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirClassReferenceExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirClassReferenceExpressionBuilder.kt @@ -11,6 +11,7 @@ import kotlin.contracts.* import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirClassReferenceExpression import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder @@ -35,7 +36,7 @@ class FirClassReferenceExpressionBuilder : FirAnnotationContainerBuilder, FirExp return FirClassReferenceExpressionImpl( source, typeRef, - annotations, + annotations.toMutableOrEmpty(), classTypeRef, ) } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirComparisonExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirComparisonExpressionBuilder.kt index c09893dc0a1..38f99dcc817 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirComparisonExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirComparisonExpressionBuilder.kt @@ -11,6 +11,7 @@ import kotlin.contracts.* import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirComparisonExpression import org.jetbrains.kotlin.fir.expressions.FirFunctionCall @@ -36,7 +37,7 @@ class FirComparisonExpressionBuilder : FirAnnotationContainerBuilder, FirExpress override fun build(): FirComparisonExpression { return FirComparisonExpressionImpl( source, - annotations, + annotations.toMutableOrEmpty(), operation, compareToCall, ) 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 5a9dc84825d..bb29399ffcb 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 @@ -12,6 +12,7 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirComponentCall @@ -51,7 +52,7 @@ class FirComponentCallBuilder : FirCallBuilder, FirAnnotationContainerBuilder, F override fun build(): FirComponentCall { return FirComponentCallImpl( source, - annotations, + annotations.toMutableOrEmpty(), contextReceiverArguments, typeArguments, dispatchReceiver, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirContinueExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirContinueExpressionBuilder.kt index 8d6b8616807..3968a6f0706 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirContinueExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirContinueExpressionBuilder.kt @@ -14,6 +14,7 @@ import org.jetbrains.kotlin.fakeElement import org.jetbrains.kotlin.fir.FirTarget import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirContinueExpression import org.jetbrains.kotlin.fir.expressions.FirLoop @@ -38,7 +39,7 @@ class FirContinueExpressionBuilder : FirLoopJumpBuilder, FirAnnotationContainerB override fun build(): FirContinueExpression { return FirContinueExpressionImpl( source, - annotations, + annotations.toMutableOrEmpty(), target, ) } 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 eef31991f74..15037eb221f 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 @@ -11,6 +11,7 @@ import kotlin.contracts.* import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall @@ -44,7 +45,7 @@ class FirDelegatedConstructorCallBuilder : FirCallBuilder, FirAnnotationContaine override fun build(): FirDelegatedConstructorCall { return FirDelegatedConstructorCallImpl( source, - annotations, + annotations.toMutableOrEmpty(), argumentList, contextReceiverArguments, constructedTypeRef, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirDoWhileLoopBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirDoWhileLoopBuilder.kt index 7a6e0fc2279..ab6c06f56a1 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirDoWhileLoopBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirDoWhileLoopBuilder.kt @@ -12,6 +12,7 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirLabel import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirDoWhileLoop @@ -36,7 +37,7 @@ class FirDoWhileLoopBuilder : FirLoopBuilder, FirAnnotationContainerBuilder { override fun build(): FirDoWhileLoop { return FirDoWhileLoopImpl( source, - annotations, + annotations.toMutableOrEmpty(), block, condition, label, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirElseIfTrueConditionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirElseIfTrueConditionBuilder.kt index b71578f33ea..0685c38dbd8 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirElseIfTrueConditionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirElseIfTrueConditionBuilder.kt @@ -14,6 +14,7 @@ import org.jetbrains.kotlin.fakeElement import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.impl.FirElseIfTrueCondition @@ -35,7 +36,7 @@ class FirElseIfTrueConditionBuilder : FirAnnotationContainerBuilder { override fun build(): FirExpression { return FirElseIfTrueCondition( source, - annotations, + annotations.toMutableOrEmpty(), ) } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirElvisExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirElvisExpressionBuilder.kt index 8d533390379..334dcb0892e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirElvisExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirElvisExpressionBuilder.kt @@ -11,6 +11,7 @@ import kotlin.contracts.* import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirElvisExpression import org.jetbrains.kotlin.fir.expressions.FirExpression @@ -38,7 +39,7 @@ class FirElvisExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBu override fun build(): FirElvisExpression { return FirElvisExpressionImpl( source, - annotations, + annotations.toMutableOrEmpty(), calleeReference, lhs, rhs, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirEmptyExpressionBlockBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirEmptyExpressionBlockBuilder.kt index 331763431a6..c99c703ff44 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirEmptyExpressionBlockBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirEmptyExpressionBlockBuilder.kt @@ -12,6 +12,7 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirStatement diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirEqualityOperatorCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirEqualityOperatorCallBuilder.kt index 8692823b253..b8fd97fd991 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirEqualityOperatorCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirEqualityOperatorCallBuilder.kt @@ -11,6 +11,7 @@ import kotlin.contracts.* import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirEqualityOperatorCall @@ -36,7 +37,7 @@ class FirEqualityOperatorCallBuilder : FirAnnotationContainerBuilder, FirExpress override fun build(): FirEqualityOperatorCall { return FirEqualityOperatorCallImpl( source, - annotations, + annotations.toMutableOrEmpty(), argumentList, operation, ) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorAnnotationCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorAnnotationCallBuilder.kt index b1a9abf5b98..bb3a7a371a7 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorAnnotationCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorAnnotationCallBuilder.kt @@ -12,6 +12,7 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirAnnotationArgumentMapping diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorExpressionBuilder.kt index 252affa5bec..88cb17a6f2f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorExpressionBuilder.kt @@ -12,6 +12,7 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.diagnostics.ConeStubDiagnostic import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -39,7 +40,7 @@ class FirErrorExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBu override fun build(): FirErrorExpression { return FirErrorExpressionImpl( source, - annotations, + annotations.toMutableOrEmpty(), diagnostic, expression, nonExpressionElement, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorLoopBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorLoopBuilder.kt index 0c2c66883b4..dcae7b25f72 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorLoopBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorLoopBuilder.kt @@ -12,6 +12,7 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirLabel import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.diagnostics.ConeStubDiagnostic import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -37,7 +38,7 @@ class FirErrorLoopBuilder : FirAnnotationContainerBuilder { override fun build(): FirErrorLoop { return FirErrorLoopImpl( source, - annotations, + annotations.toMutableOrEmpty(), label, diagnostic, ) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorResolvedQualifierBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorResolvedQualifierBuilder.kt index 0d3659860df..6c152a322bd 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorResolvedQualifierBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorResolvedQualifierBuilder.kt @@ -11,6 +11,7 @@ import kotlin.contracts.* import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirErrorResolvedQualifier @@ -45,7 +46,7 @@ class FirErrorResolvedQualifierBuilder : FirAbstractResolvedQualifierBuilder, Fi override fun build(): FirErrorResolvedQualifier { return FirErrorResolvedQualifierImpl( source, - annotations, + annotations.toMutableOrEmpty(), packageFqName, relativeClassFqName, symbol, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirExpressionStubBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirExpressionStubBuilder.kt index d99c3b7d268..fa4f482f8e1 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirExpressionStubBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirExpressionStubBuilder.kt @@ -12,6 +12,7 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.impl.FirExpressionStub @@ -35,7 +36,7 @@ class FirExpressionStubBuilder : FirAnnotationContainerBuilder { return FirExpressionStub( source, typeRef, - annotations, + annotations.toMutableOrEmpty(), ) } 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 dd9a7f1a851..510557291d5 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 @@ -12,6 +12,7 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirEmptyArgumentList @@ -53,7 +54,7 @@ open class FirFunctionCallBuilder : FirAbstractFunctionCallBuilder, FirAnnotatio return FirFunctionCallImpl( source, typeRef, - annotations, + annotations.toMutableOrEmpty(), contextReceiverArguments, typeArguments, explicitReceiver, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirGetClassCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirGetClassCallBuilder.kt index 17b12f95fc1..02113b1111e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirGetClassCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirGetClassCallBuilder.kt @@ -11,6 +11,7 @@ import kotlin.contracts.* import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirExpression @@ -38,7 +39,7 @@ class FirGetClassCallBuilder : FirCallBuilder, FirAnnotationContainerBuilder, Fi return FirGetClassCallImpl( source, typeRef, - annotations, + annotations.toMutableOrEmpty(), argumentList, ) } 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 782e6d98f63..f498258610e 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 @@ -12,6 +12,7 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirEmptyArgumentList @@ -49,7 +50,7 @@ open class FirImplicitInvokeCallBuilder : FirAbstractFunctionCallBuilder, FirAnn override fun build(): FirImplicitInvokeCall { return FirImplicitInvokeCallImpl( source, - annotations, + annotations.toMutableOrEmpty(), contextReceiverArguments, typeArguments, explicitReceiver, 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 5cefbe48bb8..e75db3f08b0 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 @@ -12,6 +12,7 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirEmptyArgumentList @@ -51,7 +52,7 @@ open class FirIntegerLiteralOperatorCallBuilder : FirAbstractFunctionCallBuilder return FirIntegerLiteralOperatorCallImpl( source, typeRef, - annotations, + annotations.toMutableOrEmpty(), contextReceiverArguments, typeArguments, explicitReceiver, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLambdaArgumentExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLambdaArgumentExpressionBuilder.kt index b97a7392896..fff748256c4 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLambdaArgumentExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLambdaArgumentExpressionBuilder.kt @@ -11,6 +11,7 @@ import kotlin.contracts.* import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirLambdaArgumentExpression @@ -33,7 +34,7 @@ class FirLambdaArgumentExpressionBuilder : FirAnnotationContainerBuilder, FirExp override fun build(): FirLambdaArgumentExpression { return FirLambdaArgumentExpressionImpl( source, - annotations, + annotations.toMutableOrEmpty(), expression, ) } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLazyBlockBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLazyBlockBuilder.kt index 80c731c5cee..a6bf67db799 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLazyBlockBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLazyBlockBuilder.kt @@ -12,6 +12,7 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirStatement diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLazyDelegatedConstructorCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLazyDelegatedConstructorCallBuilder.kt index 209dba4b529..826d7a340b9 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLazyDelegatedConstructorCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLazyDelegatedConstructorCallBuilder.kt @@ -12,6 +12,7 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLazyExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLazyExpressionBuilder.kt index 584e6b46d1c..b4a65127b20 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLazyExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLazyExpressionBuilder.kt @@ -12,6 +12,7 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.impl.FirLazyExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirNamedArgumentExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirNamedArgumentExpressionBuilder.kt index bf13bf737a0..ea6ca6c15d4 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirNamedArgumentExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirNamedArgumentExpressionBuilder.kt @@ -11,6 +11,7 @@ import kotlin.contracts.* import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirNamedArgumentExpression @@ -36,7 +37,7 @@ class FirNamedArgumentExpressionBuilder : FirAnnotationContainerBuilder, FirExpr override fun build(): FirNamedArgumentExpression { return FirNamedArgumentExpressionImpl( source, - annotations, + annotations.toMutableOrEmpty(), expression, isSpread, name, 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 e78d5ae00bb..bbd6f5dc3e8 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 @@ -12,6 +12,7 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression @@ -49,7 +50,7 @@ class FirPropertyAccessExpressionBuilder : FirQualifiedAccessBuilder, FirAnnotat return FirPropertyAccessExpressionImpl( source, typeRef, - annotations, + annotations.toMutableOrEmpty(), calleeReference, contextReceiverArguments, typeArguments, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirQualifiedErrorAccessExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirQualifiedErrorAccessExpressionBuilder.kt index d6f072b7e76..1d55bf2a991 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirQualifiedErrorAccessExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirQualifiedErrorAccessExpressionBuilder.kt @@ -11,6 +11,7 @@ import kotlin.contracts.* import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.diagnostics.ConeStubDiagnostic import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -39,7 +40,7 @@ class FirQualifiedErrorAccessExpressionBuilder : FirAnnotationContainerBuilder, override fun build(): FirQualifiedErrorAccessExpression { return FirQualifiedErrorAccessExpressionImpl( source, - annotations, + annotations.toMutableOrEmpty(), diagnostic, selector, receiver, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirResolvedQualifierBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirResolvedQualifierBuilder.kt index 7d8ae7ca431..ad7fb9fe077 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirResolvedQualifierBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirResolvedQualifierBuilder.kt @@ -11,6 +11,7 @@ import kotlin.contracts.* import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.declarations.FirRegularClass import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -47,7 +48,7 @@ class FirResolvedQualifierBuilder : FirAbstractResolvedQualifierBuilder, FirAnno return FirResolvedQualifierImpl( source, typeRef, - annotations, + annotations.toMutableOrEmpty(), packageFqName, relativeClassFqName, symbol, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirResolvedReifiedParameterReferenceBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirResolvedReifiedParameterReferenceBuilder.kt index 795e16273c1..c74163cded0 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirResolvedReifiedParameterReferenceBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirResolvedReifiedParameterReferenceBuilder.kt @@ -11,6 +11,7 @@ import kotlin.contracts.* import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirResolvedReifiedParameterReference import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder @@ -36,7 +37,7 @@ class FirResolvedReifiedParameterReferenceBuilder : FirAnnotationContainerBuilde return FirResolvedReifiedParameterReferenceImpl( source, typeRef, - annotations, + annotations.toMutableOrEmpty(), symbol, ) } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirReturnExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirReturnExpressionBuilder.kt index 14989ff4fd0..216a7d89267 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirReturnExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirReturnExpressionBuilder.kt @@ -14,6 +14,7 @@ import org.jetbrains.kotlin.fakeElement import org.jetbrains.kotlin.fir.FirTarget import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.declarations.FirFunction import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression @@ -39,7 +40,7 @@ class FirReturnExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionB override fun build(): FirReturnExpression { return FirReturnExpressionImpl( source, - annotations, + annotations.toMutableOrEmpty(), target, result, ) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirSafeCallExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirSafeCallExpressionBuilder.kt index 052c81c3530..17269327b07 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirSafeCallExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirSafeCallExpressionBuilder.kt @@ -12,6 +12,7 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirExpressionRef import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirCheckedSafeCallSubject import org.jetbrains.kotlin.fir.expressions.FirExpression @@ -41,7 +42,7 @@ class FirSafeCallExpressionBuilder : FirAnnotationContainerBuilder, FirExpressio return FirSafeCallExpressionImpl( source, typeRef, - annotations, + annotations.toMutableOrEmpty(), receiver, checkedSubjectRef, selector, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirSmartCastExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirSmartCastExpressionBuilder.kt index d01615928fc..a9e2f8e327d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirSmartCastExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirSmartCastExpressionBuilder.kt @@ -11,6 +11,7 @@ import kotlin.contracts.* import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirSmartCastExpression @@ -40,7 +41,7 @@ class FirSmartCastExpressionBuilder : FirAnnotationContainerBuilder, FirExpressi override fun build(): FirSmartCastExpression { return FirSmartCastExpressionImpl( source, - annotations, + annotations.toMutableOrEmpty(), typeRef, originalExpression, typesFromSmartCast, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirSpreadArgumentExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirSpreadArgumentExpressionBuilder.kt index 0523872fd1c..ad0dc574d90 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirSpreadArgumentExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirSpreadArgumentExpressionBuilder.kt @@ -11,6 +11,7 @@ import kotlin.contracts.* import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirSpreadArgumentExpression @@ -33,7 +34,7 @@ class FirSpreadArgumentExpressionBuilder : FirAnnotationContainerBuilder, FirExp override fun build(): FirSpreadArgumentExpression { return FirSpreadArgumentExpressionImpl( source, - annotations, + annotations.toMutableOrEmpty(), expression, ) } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirStringConcatenationCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirStringConcatenationCallBuilder.kt index b69c7902cb1..2d21ce2afb4 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirStringConcatenationCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirStringConcatenationCallBuilder.kt @@ -13,6 +13,7 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fakeElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirStringConcatenationCall @@ -37,7 +38,7 @@ class FirStringConcatenationCallBuilder : FirCallBuilder, FirAnnotationContainer override fun build(): FirStringConcatenationCall { return FirStringConcatenationCallImpl( source, - annotations, + annotations.toMutableOrEmpty(), argumentList, ) } 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 e8f601c2423..f8b2f6f0cb4 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 @@ -12,6 +12,7 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirThisReceiverExpression @@ -45,7 +46,7 @@ class FirThisReceiverExpressionBuilder : FirQualifiedAccessBuilder, FirAnnotatio return FirThisReceiverExpressionImpl( source, typeRef, - annotations, + annotations.toMutableOrEmpty(), contextReceiverArguments, typeArguments, calleeReference, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirThrowExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirThrowExpressionBuilder.kt index 8c6b6f8fd81..5933beedd71 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirThrowExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirThrowExpressionBuilder.kt @@ -13,6 +13,7 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fakeElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirThrowExpression @@ -36,7 +37,7 @@ class FirThrowExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBu override fun build(): FirThrowExpression { return FirThrowExpressionImpl( source, - annotations, + annotations.toMutableOrEmpty(), exception, ) } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirTryExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirTryExpressionBuilder.kt index 1aa6cb92aa4..21635a21d45 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirTryExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirTryExpressionBuilder.kt @@ -11,6 +11,7 @@ import kotlin.contracts.* import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirCatch @@ -42,7 +43,7 @@ class FirTryExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuil return FirTryExpressionImpl( source, typeRef, - annotations, + annotations.toMutableOrEmpty(), calleeReference, tryBlock, catches, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirTypeOperatorCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirTypeOperatorCallBuilder.kt index 42d8f9dea8d..d195b8ea1f5 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirTypeOperatorCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirTypeOperatorCallBuilder.kt @@ -11,6 +11,7 @@ import kotlin.contracts.* import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirEmptyArgumentList @@ -39,7 +40,7 @@ class FirTypeOperatorCallBuilder : FirCallBuilder, FirAnnotationContainerBuilder override fun build(): FirTypeOperatorCall { return FirTypeOperatorCallImpl( source, - annotations, + annotations.toMutableOrEmpty(), argumentList, operation, conversionTypeRef, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirUnitExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirUnitExpressionBuilder.kt index f62fc25c3dc..7f6e96c0030 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirUnitExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirUnitExpressionBuilder.kt @@ -14,6 +14,7 @@ import org.jetbrains.kotlin.fakeElement import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.impl.FirUnitExpression @@ -35,7 +36,7 @@ class FirUnitExpressionBuilder : FirAnnotationContainerBuilder { override fun build(): FirExpression { return FirUnitExpression( source, - annotations, + annotations.toMutableOrEmpty(), ) } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirVarargArgumentsExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirVarargArgumentsExpressionBuilder.kt index 58c2067890c..d9d6c72d568 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirVarargArgumentsExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirVarargArgumentsExpressionBuilder.kt @@ -11,6 +11,7 @@ import kotlin.contracts.* import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirVarargArgumentsExpression @@ -37,7 +38,7 @@ class FirVarargArgumentsExpressionBuilder : FirAnnotationContainerBuilder, FirEx return FirVarargArgumentsExpressionImpl( source, typeRef, - annotations, + annotations.toMutableOrEmpty(), arguments, varargElementType, ) 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 7a67759206d..6b37b3e2dde 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 @@ -12,6 +12,7 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirVariableAssignment @@ -44,7 +45,7 @@ class FirVariableAssignmentBuilder : FirQualifiedAccessBuilder, FirAnnotationCon override fun build(): FirVariableAssignment { return FirVariableAssignmentImpl( calleeReference, - annotations, + annotations.toMutableOrEmpty(), contextReceiverArguments, typeArguments, explicitReceiver, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhenExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhenExpressionBuilder.kt index c4a2e19ec7b..c3981fbb5c8 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhenExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhenExpressionBuilder.kt @@ -11,6 +11,7 @@ import kotlin.contracts.* import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.declarations.FirVariable import org.jetbrains.kotlin.fir.expressions.ExhaustivenessStatus import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -46,7 +47,7 @@ class FirWhenExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBui return FirWhenExpressionImpl( source, typeRef, - annotations, + annotations.toMutableOrEmpty(), calleeReference, subject, subjectVariable, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhenSubjectExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhenSubjectExpressionBuilder.kt index bf813bf0141..43c8b0367b7 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhenSubjectExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhenSubjectExpressionBuilder.kt @@ -12,6 +12,7 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirExpressionRef import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirWhenExpression import org.jetbrains.kotlin.fir.expressions.FirWhenSubjectExpression @@ -34,7 +35,7 @@ class FirWhenSubjectExpressionBuilder : FirAnnotationContainerBuilder, FirExpres override fun build(): FirWhenSubjectExpression { return FirWhenSubjectExpressionImpl( source, - annotations, + annotations.toMutableOrEmpty(), whenRef, ) } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhileLoopBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhileLoopBuilder.kt index e0f09fc7264..4705638e60f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhileLoopBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhileLoopBuilder.kt @@ -12,6 +12,7 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirLabel import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirExpression @@ -36,7 +37,7 @@ class FirWhileLoopBuilder : FirLoopBuilder, FirAnnotationContainerBuilder { override fun build(): FirWhileLoop { return FirWhileLoopImpl( source, - annotations, + annotations.toMutableOrEmpty(), label, condition, block, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWrappedDelegateExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWrappedDelegateExpressionBuilder.kt index 1b090685ede..c31b6b165fa 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWrappedDelegateExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWrappedDelegateExpressionBuilder.kt @@ -11,6 +11,7 @@ import kotlin.contracts.* import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirWrappedDelegateExpression @@ -34,7 +35,7 @@ class FirWrappedDelegateExpressionBuilder : FirAnnotationContainerBuilder, FirEx override fun build(): FirWrappedDelegateExpression { return FirWrappedDelegateExpressionImpl( source, - annotations, + annotations.toMutableOrEmpty(), expression, delegateProvider, ) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAnnotationCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAnnotationCallImpl.kt index 558757e4fb3..5768c6fdccc 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAnnotationCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAnnotationCallImpl.kt @@ -18,6 +18,8 @@ import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.types.FirTypeProjection import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -73,6 +75,8 @@ internal class FirAnnotationCallImpl( override fun replaceTypeRef(newTypeRef: FirTypeRef) {} + override fun replaceAnnotations(newAnnotations: List) {} + override fun replaceAnnotationTypeRef(newAnnotationTypeRef: FirTypeRef) { annotationTypeRef = newAnnotationTypeRef } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAnnotationImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAnnotationImpl.kt index 49128cdf2dc..8041a5b8a5c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAnnotationImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAnnotationImpl.kt @@ -14,6 +14,8 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotationArgumentMapping import org.jetbrains.kotlin.fir.types.FirTypeProjection import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -59,6 +61,8 @@ internal class FirAnnotationImpl( override fun replaceTypeRef(newTypeRef: FirTypeRef) {} + override fun replaceAnnotations(newAnnotations: List) {} + override fun replaceAnnotationTypeRef(newAnnotationTypeRef: FirTypeRef) { annotationTypeRef = newAnnotationTypeRef } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirArrayOfCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirArrayOfCallImpl.kt index 25c356715b5..260b828e252 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirArrayOfCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirArrayOfCallImpl.kt @@ -13,6 +13,8 @@ import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirArrayOfCall import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -22,7 +24,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirArrayOfCallImpl( override val source: KtSourceElement?, override var typeRef: FirTypeRef, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override var argumentList: FirArgumentList, ) : FirArrayOfCall() { override fun acceptChildren(visitor: FirVisitor, data: D) { @@ -47,6 +49,10 @@ internal class FirArrayOfCallImpl( typeRef = newTypeRef } + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } + override fun replaceArgumentList(newArgumentList: FirArgumentList) { argumentList = newArgumentList } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAssignmentOperatorStatementImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAssignmentOperatorStatementImpl.kt index c8b3974cff9..529a10f7313 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAssignmentOperatorStatementImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAssignmentOperatorStatementImpl.kt @@ -13,6 +13,8 @@ import org.jetbrains.kotlin.fir.expressions.FirAssignmentOperatorStatement import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirOperation import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -21,7 +23,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirAssignmentOperatorStatementImpl( override val source: KtSourceElement?, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override val operation: FirOperation, override var leftArgument: FirExpression, override var rightArgument: FirExpression, @@ -53,4 +55,8 @@ internal class FirAssignmentOperatorStatementImpl( rightArgument = rightArgument.transform(transformer, data) return this } + + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAugmentedArraySetCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAugmentedArraySetCallImpl.kt index 23bbe945f16..7803f95d567 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAugmentedArraySetCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAugmentedArraySetCallImpl.kt @@ -15,6 +15,8 @@ import org.jetbrains.kotlin.fir.expressions.FirFunctionCall import org.jetbrains.kotlin.fir.expressions.FirOperation import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -23,7 +25,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirAugmentedArraySetCallImpl( override val source: KtSourceElement?, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override var lhsGetCall: FirFunctionCall, override var rhs: FirExpression, override val operation: FirOperation, @@ -50,6 +52,10 @@ internal class FirAugmentedArraySetCallImpl( return this } + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } + override fun replaceCalleeReference(newCalleeReference: FirReference) { calleeReference = newCalleeReference } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBinaryLogicExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBinaryLogicExpressionImpl.kt index e8a8a73a426..49e57c19a0a 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBinaryLogicExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBinaryLogicExpressionImpl.kt @@ -15,6 +15,8 @@ import org.jetbrains.kotlin.fir.expressions.LogicOperationKind import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImpl import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -23,7 +25,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirBinaryLogicExpressionImpl( override val source: KtSourceElement?, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override var leftOperand: FirExpression, override var rightOperand: FirExpression, override val kind: LogicOperationKind, @@ -68,4 +70,8 @@ internal class FirBinaryLogicExpressionImpl( override fun replaceTypeRef(newTypeRef: FirTypeRef) { typeRef = newTypeRef } + + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBlockImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBlockImpl.kt index e1541ba6288..9895460a853 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBlockImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBlockImpl.kt @@ -14,6 +14,8 @@ import org.jetbrains.kotlin.fir.expressions.FirStatement import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImpl import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -22,7 +24,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirBlockImpl( override val source: KtSourceElement?, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override val statements: MutableList, ) : FirBlock() { override var typeRef: FirTypeRef = FirImplicitTypeRefImpl(null) @@ -55,6 +57,10 @@ internal class FirBlockImpl( return this } + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } + override fun replaceTypeRef(newTypeRef: FirTypeRef) { typeRef = newTypeRef } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBreakExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBreakExpressionImpl.kt index 363b51fedea..739404fc5fc 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBreakExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBreakExpressionImpl.kt @@ -17,6 +17,8 @@ import org.jetbrains.kotlin.fir.expressions.FirLoop import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.impl.FirImplicitNothingTypeRef import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -25,7 +27,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirBreakExpressionImpl( override val source: KtSourceElement?, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override val target: FirTarget, ) : FirBreakExpression() { override var typeRef: FirTypeRef = FirImplicitNothingTypeRef(source?.fakeElement(KtFakeSourceElementKind.ImplicitTypeRef)) @@ -49,4 +51,8 @@ internal class FirBreakExpressionImpl( override fun replaceTypeRef(newTypeRef: FirTypeRef) { typeRef = newTypeRef } + + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } } 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 51d837d40b0..6dfaf83d239 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 @@ -16,6 +16,8 @@ import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.types.FirTypeProjection import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.FirImplementationDetail /* @@ -26,7 +28,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail internal class FirCallableReferenceAccessImpl( override var source: KtSourceElement?, override var typeRef: FirTypeRef, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override val contextReceiverArguments: MutableList, override val typeArguments: MutableList, override var explicitReceiver: FirExpression?, @@ -95,6 +97,10 @@ internal class FirCallableReferenceAccessImpl( typeRef = newTypeRef } + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } + override fun replaceContextReceiverArguments(newContextReceiverArguments: List) { contextReceiverArguments.clear() contextReceiverArguments.addAll(newContextReceiverArguments) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCheckNotNullCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCheckNotNullCallImpl.kt index fd22636c213..e00b28e52cd 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCheckNotNullCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCheckNotNullCallImpl.kt @@ -14,6 +14,8 @@ import org.jetbrains.kotlin.fir.expressions.FirCheckNotNullCall import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -23,7 +25,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirCheckNotNullCallImpl( override val source: KtSourceElement?, override var typeRef: FirTypeRef, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override var argumentList: FirArgumentList, override var calleeReference: FirReference, ) : FirCheckNotNullCall() { @@ -56,6 +58,10 @@ internal class FirCheckNotNullCallImpl( typeRef = newTypeRef } + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } + override fun replaceArgumentList(newArgumentList: FirArgumentList) { argumentList = newArgumentList } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCheckedSafeCallSubjectImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCheckedSafeCallSubjectImpl.kt index 4d75704d756..c4d251e3570 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCheckedSafeCallSubjectImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCheckedSafeCallSubjectImpl.kt @@ -14,6 +14,8 @@ import org.jetbrains.kotlin.fir.expressions.FirCheckedSafeCallSubject import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -23,7 +25,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirCheckedSafeCallSubjectImpl( override val source: KtSourceElement?, override var typeRef: FirTypeRef, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override val originalReceiverRef: FirExpressionRef, ) : FirCheckedSafeCallSubject() { override fun acceptChildren(visitor: FirVisitor, data: D) { @@ -45,4 +47,8 @@ internal class FirCheckedSafeCallSubjectImpl( override fun replaceTypeRef(newTypeRef: FirTypeRef) { typeRef = newTypeRef } + + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirClassReferenceExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirClassReferenceExpressionImpl.kt index 4522eebce07..3890feb2e5c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirClassReferenceExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirClassReferenceExpressionImpl.kt @@ -12,6 +12,8 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirClassReferenceExpression import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -21,7 +23,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirClassReferenceExpressionImpl( override val source: KtSourceElement?, override var typeRef: FirTypeRef, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override var classTypeRef: FirTypeRef, ) : FirClassReferenceExpression() { override fun acceptChildren(visitor: FirVisitor, data: D) { @@ -45,4 +47,8 @@ internal class FirClassReferenceExpressionImpl( override fun replaceTypeRef(newTypeRef: FirTypeRef) { typeRef = newTypeRef } + + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirComparisonExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirComparisonExpressionImpl.kt index 9861c70c231..6a7cae03e40 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirComparisonExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirComparisonExpressionImpl.kt @@ -15,6 +15,8 @@ import org.jetbrains.kotlin.fir.expressions.FirOperation import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.impl.FirImplicitBooleanTypeRef import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -23,7 +25,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirComparisonExpressionImpl( override val source: KtSourceElement?, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override val operation: FirOperation, override var compareToCall: FirFunctionCall, ) : FirComparisonExpression() { @@ -50,4 +52,8 @@ internal class FirComparisonExpressionImpl( override fun replaceTypeRef(newTypeRef: FirTypeRef) { typeRef = newTypeRef } + + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } } 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 7edeeeda94e..49994b2b3ea 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 @@ -22,6 +22,8 @@ import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImpl import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -31,7 +33,7 @@ import org.jetbrains.kotlin.fir.visitors.* @OptIn(FirImplementationDetail::class) internal class FirComponentCallImpl( override var source: KtSourceElement?, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override val contextReceiverArguments: MutableList, override val typeArguments: MutableList, override var dispatchReceiver: FirExpression, @@ -106,6 +108,10 @@ internal class FirComponentCallImpl( typeRef = newTypeRef } + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } + override fun replaceContextReceiverArguments(newContextReceiverArguments: List) { contextReceiverArguments.clear() contextReceiverArguments.addAll(newContextReceiverArguments) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirConstExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirConstExpressionImpl.kt index ab993b39f51..8bd7ad2137f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirConstExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirConstExpressionImpl.kt @@ -14,6 +14,8 @@ import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImpl import org.jetbrains.kotlin.types.ConstantValueKind import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -22,7 +24,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirConstExpressionImpl ( override val source: KtSourceElement?, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override var kind: ConstantValueKind, override val value: T, ) : FirConstExpression() { @@ -48,6 +50,10 @@ internal class FirConstExpressionImpl ( typeRef = newTypeRef } + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } + override fun replaceKind(newKind: ConstantValueKind) { kind = newKind } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirContinueExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirContinueExpressionImpl.kt index 93ededa220e..3985bb8fe7c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirContinueExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirContinueExpressionImpl.kt @@ -17,6 +17,8 @@ import org.jetbrains.kotlin.fir.expressions.FirLoop import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.impl.FirImplicitNothingTypeRef import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -25,7 +27,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirContinueExpressionImpl( override val source: KtSourceElement?, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override val target: FirTarget, ) : FirContinueExpression() { override var typeRef: FirTypeRef = FirImplicitNothingTypeRef(source?.fakeElement(KtFakeSourceElementKind.ImplicitTypeRef)) @@ -49,4 +51,8 @@ internal class FirContinueExpressionImpl( override fun replaceTypeRef(newTypeRef: FirTypeRef) { typeRef = newTypeRef } + + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } } 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 e2845b18e12..dc92ef40123 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 @@ -17,6 +17,8 @@ import org.jetbrains.kotlin.fir.references.impl.FirExplicitSuperReference import org.jetbrains.kotlin.fir.references.impl.FirExplicitThisReference import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -25,7 +27,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirDelegatedConstructorCallImpl( override val source: KtSourceElement?, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override var argumentList: FirArgumentList, override val contextReceiverArguments: MutableList, override var constructedTypeRef: FirTypeRef, @@ -67,6 +69,10 @@ internal class FirDelegatedConstructorCallImpl( return this } + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } + override fun replaceArgumentList(newArgumentList: FirArgumentList) { argumentList = newArgumentList } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirDoWhileLoopImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirDoWhileLoopImpl.kt index 4e63df01807..7c6acc9c442 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirDoWhileLoopImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirDoWhileLoopImpl.kt @@ -14,6 +14,8 @@ import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirDoWhileLoop import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -22,7 +24,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirDoWhileLoopImpl( override val source: KtSourceElement?, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override var block: FirBlock, override var condition: FirExpression, override var label: FirLabel?, @@ -61,4 +63,8 @@ internal class FirDoWhileLoopImpl( label = label?.transform(transformer, data) return this } + + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirElseIfTrueCondition.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirElseIfTrueCondition.kt index d03affdf56e..211e3149842 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirElseIfTrueCondition.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirElseIfTrueCondition.kt @@ -16,6 +16,8 @@ import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.impl.FirImplicitBooleanTypeRef import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -24,7 +26,7 @@ import org.jetbrains.kotlin.fir.visitors.* class FirElseIfTrueCondition @FirImplementationDetail constructor( override val source: KtSourceElement?, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, ) : FirExpression() { override var typeRef: FirTypeRef = FirImplicitBooleanTypeRef(source?.fakeElement(KtFakeSourceElementKind.ImplicitTypeRef)) @@ -47,4 +49,8 @@ class FirElseIfTrueCondition @FirImplementationDetail constructor( override fun replaceTypeRef(newTypeRef: FirTypeRef) { typeRef = newTypeRef } + + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirElvisExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirElvisExpressionImpl.kt index 457bf544de2..3bb0bea2a60 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirElvisExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirElvisExpressionImpl.kt @@ -15,6 +15,8 @@ import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImpl import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -23,7 +25,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirElvisExpressionImpl( override val source: KtSourceElement?, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override var calleeReference: FirReference, override var lhs: FirExpression, override var rhs: FirExpression, @@ -71,6 +73,10 @@ internal class FirElvisExpressionImpl( typeRef = newTypeRef } + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } + override fun replaceCalleeReference(newCalleeReference: FirReference) { calleeReference = newCalleeReference } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirEmptyExpressionBlock.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirEmptyExpressionBlock.kt index 1017cdc5ce9..fe066fc3882 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirEmptyExpressionBlock.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirEmptyExpressionBlock.kt @@ -15,6 +15,8 @@ import org.jetbrains.kotlin.fir.expressions.FirStatement import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImpl import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -49,6 +51,8 @@ class FirEmptyExpressionBlock : FirBlock() { return this } + override fun replaceAnnotations(newAnnotations: List) {} + override fun replaceTypeRef(newTypeRef: FirTypeRef) { typeRef = newTypeRef } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirEqualityOperatorCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirEqualityOperatorCallImpl.kt index 8a2aaf64a57..b1de3193fa7 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirEqualityOperatorCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirEqualityOperatorCallImpl.kt @@ -15,6 +15,8 @@ import org.jetbrains.kotlin.fir.expressions.FirOperation import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.impl.FirImplicitBooleanTypeRef import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -23,7 +25,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirEqualityOperatorCallImpl( override val source: KtSourceElement?, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override var argumentList: FirArgumentList, override val operation: FirOperation, ) : FirEqualityOperatorCall() { @@ -51,6 +53,10 @@ internal class FirEqualityOperatorCallImpl( typeRef = newTypeRef } + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } + override fun replaceArgumentList(newArgumentList: FirArgumentList) { argumentList = newArgumentList } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorAnnotationCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorAnnotationCallImpl.kt index 7fe553b5561..51f9167c37a 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorAnnotationCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorAnnotationCallImpl.kt @@ -19,6 +19,8 @@ import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.types.FirTypeProjection import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -75,6 +77,8 @@ internal class FirErrorAnnotationCallImpl( override fun replaceTypeRef(newTypeRef: FirTypeRef) {} + override fun replaceAnnotations(newAnnotations: List) {} + override fun replaceAnnotationTypeRef(newAnnotationTypeRef: FirTypeRef) { annotationTypeRef = newAnnotationTypeRef } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorExpressionImpl.kt index f682bf3891b..afb8f0e4b57 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorExpressionImpl.kt @@ -17,6 +17,8 @@ import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.impl.FirErrorTypeRefImpl import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -25,7 +27,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirErrorExpressionImpl( override val source: KtSourceElement?, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override val diagnostic: ConeDiagnostic, override var expression: FirExpression?, override var nonExpressionElement: FirElement?, @@ -55,4 +57,8 @@ internal class FirErrorExpressionImpl( override fun replaceTypeRef(newTypeRef: FirTypeRef) { typeRef = newTypeRef } + + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorLoopImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorLoopImpl.kt index dc758bb4439..73160619328 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorLoopImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorLoopImpl.kt @@ -17,6 +17,8 @@ import org.jetbrains.kotlin.fir.expressions.FirErrorLoop import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.impl.FirEmptyExpressionBlock import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -25,12 +27,12 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirErrorLoopImpl( override val source: KtSourceElement?, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override var label: FirLabel?, override val diagnostic: ConeDiagnostic, ) : FirErrorLoop() { override var block: FirBlock = FirEmptyExpressionBlock() - override var condition: FirExpression = FirErrorExpressionImpl(source, mutableListOf(), ConeStubDiagnostic(diagnostic), null, null) + override var condition: FirExpression = FirErrorExpressionImpl(source, MutableOrEmptyList(), ConeStubDiagnostic(diagnostic), null, null) override fun acceptChildren(visitor: FirVisitor, data: D) { annotations.forEach { it.accept(visitor, data) } @@ -66,4 +68,8 @@ internal class FirErrorLoopImpl( label = label?.transform(transformer, data) return this } + + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorResolvedQualifierImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorResolvedQualifierImpl.kt index 094e71b4507..f00764e43f4 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorResolvedQualifierImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorResolvedQualifierImpl.kt @@ -18,6 +18,8 @@ import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImpl import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -26,7 +28,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirErrorResolvedQualifierImpl( override val source: KtSourceElement?, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override val packageFqName: FqName, override val relativeClassFqName: FqName?, override val symbol: FirClassLikeSymbol<*>?, @@ -68,6 +70,10 @@ internal class FirErrorResolvedQualifierImpl( typeRef = newTypeRef } + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } + override fun replaceIsNullableLHSForCallableReference(newIsNullableLHSForCallableReference: Boolean) { isNullableLHSForCallableReference = newIsNullableLHSForCallableReference } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirExpressionStub.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirExpressionStub.kt index 30105cff77a..2fc017e854e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirExpressionStub.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirExpressionStub.kt @@ -13,6 +13,8 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -22,7 +24,7 @@ import org.jetbrains.kotlin.fir.visitors.* class FirExpressionStub @FirImplementationDetail constructor( override val source: KtSourceElement?, override var typeRef: FirTypeRef, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, ) : FirExpression() { override fun acceptChildren(visitor: FirVisitor, data: D) { typeRef.accept(visitor, data) @@ -43,4 +45,8 @@ class FirExpressionStub @FirImplementationDetail constructor( override fun replaceTypeRef(newTypeRef: FirTypeRef) { typeRef = newTypeRef } + + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } } 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 e29bc9a6efe..7471ec8a6ab 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 @@ -19,6 +19,8 @@ import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.types.FirTypeProjection import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -28,7 +30,7 @@ import org.jetbrains.kotlin.fir.visitors.* open class FirFunctionCallImpl @FirImplementationDetail constructor( override var source: KtSourceElement?, override var typeRef: FirTypeRef, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override val contextReceiverArguments: MutableList, override val typeArguments: MutableList, override var explicitReceiver: FirExpression?, @@ -100,6 +102,10 @@ open class FirFunctionCallImpl @FirImplementationDetail constructor( typeRef = newTypeRef } + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } + override fun replaceContextReceiverArguments(newContextReceiverArguments: List) { contextReceiverArguments.clear() contextReceiverArguments.addAll(newContextReceiverArguments) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirGetClassCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirGetClassCallImpl.kt index 6e2b18f2a47..19f3904d0a0 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirGetClassCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirGetClassCallImpl.kt @@ -14,6 +14,8 @@ import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirGetClassCall import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -23,7 +25,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirGetClassCallImpl( override val source: KtSourceElement?, override var typeRef: FirTypeRef, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override var argumentList: FirArgumentList, ) : FirGetClassCall() { override val argument: FirExpression get() = argumentList.arguments.first() @@ -50,6 +52,10 @@ internal class FirGetClassCallImpl( typeRef = newTypeRef } + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } + override fun replaceArgumentList(newArgumentList: FirArgumentList) { argumentList = newArgumentList } 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 b86ac737a87..0874c20f534 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 @@ -19,6 +19,8 @@ import org.jetbrains.kotlin.fir.types.FirTypeProjection import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImpl import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.FirImplementationDetail /* @@ -28,7 +30,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail internal class FirImplicitInvokeCallImpl( override var source: KtSourceElement?, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override val contextReceiverArguments: MutableList, override val typeArguments: MutableList, override var explicitReceiver: FirExpression?, @@ -102,6 +104,10 @@ internal class FirImplicitInvokeCallImpl( typeRef = newTypeRef } + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } + override fun replaceContextReceiverArguments(newContextReceiverArguments: List) { contextReceiverArguments.clear() contextReceiverArguments.addAll(newContextReceiverArguments) 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 e6b9880334b..8eaa2758a1d 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 @@ -18,6 +18,8 @@ import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.types.FirTypeProjection import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.FirImplementationDetail /* @@ -28,7 +30,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail internal class FirIntegerLiteralOperatorCallImpl( override var source: KtSourceElement?, override var typeRef: FirTypeRef, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override val contextReceiverArguments: MutableList, override val typeArguments: MutableList, override var explicitReceiver: FirExpression?, @@ -110,6 +112,10 @@ internal class FirIntegerLiteralOperatorCallImpl( typeRef = newTypeRef } + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } + override fun replaceContextReceiverArguments(newContextReceiverArguments: List) { contextReceiverArguments.clear() contextReceiverArguments.addAll(newContextReceiverArguments) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLambdaArgumentExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLambdaArgumentExpressionImpl.kt index a7dbe3dc379..eb83975685d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLambdaArgumentExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLambdaArgumentExpressionImpl.kt @@ -13,6 +13,8 @@ import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirLambdaArgumentExpression import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -21,7 +23,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirLambdaArgumentExpressionImpl( override val source: KtSourceElement?, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override var expression: FirExpression, ) : FirLambdaArgumentExpression() { override val typeRef: FirTypeRef get() = expression.typeRef @@ -45,6 +47,10 @@ internal class FirLambdaArgumentExpressionImpl( override fun replaceTypeRef(newTypeRef: FirTypeRef) {} + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } + override fun replaceExpression(newExpression: FirExpression) { expression = newExpression } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLazyBlock.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLazyBlock.kt index 2d3f81da9a8..e345f1a4d31 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLazyBlock.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLazyBlock.kt @@ -14,6 +14,8 @@ import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirStatement import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -46,5 +48,7 @@ class FirLazyBlock : FirBlock() { return this } + override fun replaceAnnotations(newAnnotations: List) {} + override fun replaceTypeRef(newTypeRef: FirTypeRef) {} } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLazyDelegatedConstructorCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLazyDelegatedConstructorCall.kt index d478f0d7546..c6e1d5c8a2f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLazyDelegatedConstructorCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLazyDelegatedConstructorCall.kt @@ -16,6 +16,8 @@ import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -58,6 +60,8 @@ class FirLazyDelegatedConstructorCall @FirImplementationDetail constructor( return this } + override fun replaceAnnotations(newAnnotations: List) {} + override fun replaceArgumentList(newArgumentList: FirArgumentList) {} override fun replaceContextReceiverArguments(newContextReceiverArguments: List) {} diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLazyExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLazyExpression.kt index 11a09cd2a2d..61694c2af7b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLazyExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLazyExpression.kt @@ -13,6 +13,8 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -37,4 +39,6 @@ class FirLazyExpression @FirImplementationDetail constructor( } override fun replaceTypeRef(newTypeRef: FirTypeRef) {} + + override fun replaceAnnotations(newAnnotations: List) {} } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirNamedArgumentExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirNamedArgumentExpressionImpl.kt index 9212295a9fa..39b276f0fdb 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirNamedArgumentExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirNamedArgumentExpressionImpl.kt @@ -14,6 +14,8 @@ import org.jetbrains.kotlin.fir.expressions.FirNamedArgumentExpression import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -22,7 +24,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirNamedArgumentExpressionImpl( override val source: KtSourceElement?, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override var expression: FirExpression, override val isSpread: Boolean, override val name: Name, @@ -47,6 +49,10 @@ internal class FirNamedArgumentExpressionImpl( override fun replaceTypeRef(newTypeRef: FirTypeRef) {} + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } + override fun replaceExpression(newExpression: FirExpression) { expression = newExpression } 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 5d0950df516..b8cbd0edb4c 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 @@ -17,6 +17,8 @@ import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.types.FirTypeProjection import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -26,7 +28,7 @@ import org.jetbrains.kotlin.fir.visitors.* class FirPropertyAccessExpressionImpl @FirImplementationDetail constructor( override var source: KtSourceElement?, override var typeRef: FirTypeRef, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override var calleeReference: FirReference, override val contextReceiverArguments: MutableList, override val typeArguments: MutableList, @@ -95,6 +97,10 @@ class FirPropertyAccessExpressionImpl @FirImplementationDetail constructor( typeRef = newTypeRef } + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } + override fun replaceCalleeReference(newCalleeReference: FirReference) { calleeReference = newCalleeReference } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirQualifiedErrorAccessExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirQualifiedErrorAccessExpressionImpl.kt index daf54fcabec..2ce4abb801e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirQualifiedErrorAccessExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirQualifiedErrorAccessExpressionImpl.kt @@ -17,6 +17,8 @@ import org.jetbrains.kotlin.fir.expressions.FirQualifiedErrorAccessExpression import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.impl.FirErrorTypeRefImpl import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -25,7 +27,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirQualifiedErrorAccessExpressionImpl( override val source: KtSourceElement?, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override val diagnostic: ConeDiagnostic, override var selector: FirErrorExpression, override var receiver: FirExpression, @@ -55,4 +57,8 @@ internal class FirQualifiedErrorAccessExpressionImpl( override fun replaceTypeRef(newTypeRef: FirTypeRef) { typeRef = newTypeRef } + + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirResolvedQualifierImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirResolvedQualifierImpl.kt index c4a78267c16..510ec5de644 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirResolvedQualifierImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirResolvedQualifierImpl.kt @@ -18,6 +18,8 @@ import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -27,7 +29,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirResolvedQualifierImpl( override val source: KtSourceElement?, override var typeRef: FirTypeRef, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override var packageFqName: FqName, override var relativeClassFqName: FqName?, override val symbol: FirClassLikeSymbol<*>?, @@ -67,6 +69,10 @@ internal class FirResolvedQualifierImpl( typeRef = newTypeRef } + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } + override fun replaceIsNullableLHSForCallableReference(newIsNullableLHSForCallableReference: Boolean) { isNullableLHSForCallableReference = newIsNullableLHSForCallableReference } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirResolvedReifiedParameterReferenceImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirResolvedReifiedParameterReferenceImpl.kt index 51421e933ae..51e4718959e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirResolvedReifiedParameterReferenceImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirResolvedReifiedParameterReferenceImpl.kt @@ -13,6 +13,8 @@ import org.jetbrains.kotlin.fir.expressions.FirResolvedReifiedParameterReference import org.jetbrains.kotlin.fir.symbols.impl.FirTypeParameterSymbol import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -22,7 +24,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirResolvedReifiedParameterReferenceImpl( override val source: KtSourceElement?, override var typeRef: FirTypeRef, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override val symbol: FirTypeParameterSymbol, ) : FirResolvedReifiedParameterReference() { override fun acceptChildren(visitor: FirVisitor, data: D) { @@ -44,4 +46,8 @@ internal class FirResolvedReifiedParameterReferenceImpl( override fun replaceTypeRef(newTypeRef: FirTypeRef) { typeRef = newTypeRef } + + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirReturnExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirReturnExpressionImpl.kt index 5d4ab7ceb4b..825b273715e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirReturnExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirReturnExpressionImpl.kt @@ -18,6 +18,8 @@ import org.jetbrains.kotlin.fir.expressions.FirReturnExpression import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.impl.FirImplicitNothingTypeRef import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -26,7 +28,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirReturnExpressionImpl( override val source: KtSourceElement?, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override val target: FirTarget, override var result: FirExpression, ) : FirReturnExpression() { @@ -63,4 +65,8 @@ internal class FirReturnExpressionImpl( override fun replaceTypeRef(newTypeRef: FirTypeRef) { typeRef = newTypeRef } + + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirSafeCallExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirSafeCallExpressionImpl.kt index 8a754f9ed59..8f59015d86b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirSafeCallExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirSafeCallExpressionImpl.kt @@ -16,6 +16,8 @@ import org.jetbrains.kotlin.fir.expressions.FirSafeCallExpression import org.jetbrains.kotlin.fir.expressions.FirStatement import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -25,7 +27,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirSafeCallExpressionImpl( override val source: KtSourceElement?, override var typeRef: FirTypeRef, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override var receiver: FirExpression, override val checkedSubjectRef: FirExpressionRef, override var selector: FirStatement, @@ -64,6 +66,10 @@ internal class FirSafeCallExpressionImpl( typeRef = newTypeRef } + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } + override fun replaceSelector(newSelector: FirStatement) { selector = newSelector } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirSmartCastExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirSmartCastExpressionImpl.kt index 7dfe3a50483..9bf0216c5a7 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirSmartCastExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirSmartCastExpressionImpl.kt @@ -15,6 +15,8 @@ import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.types.SmartcastStability import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -23,7 +25,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirSmartCastExpressionImpl( override val source: KtSourceElement?, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override var typeRef: FirTypeRef, override var originalExpression: FirExpression, override val typesFromSmartCast: Collection, @@ -60,6 +62,10 @@ internal class FirSmartCastExpressionImpl( return this } + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } + override fun replaceTypeRef(newTypeRef: FirTypeRef) { typeRef = newTypeRef } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirSpreadArgumentExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirSpreadArgumentExpressionImpl.kt index 1c6fe5a3716..b2173e6b3c0 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirSpreadArgumentExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirSpreadArgumentExpressionImpl.kt @@ -13,6 +13,8 @@ import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirSpreadArgumentExpression import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -21,7 +23,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirSpreadArgumentExpressionImpl( override val source: KtSourceElement?, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override var expression: FirExpression, ) : FirSpreadArgumentExpression() { override val typeRef: FirTypeRef get() = expression.typeRef @@ -45,6 +47,10 @@ internal class FirSpreadArgumentExpressionImpl( override fun replaceTypeRef(newTypeRef: FirTypeRef) {} + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } + override fun replaceExpression(newExpression: FirExpression) { expression = newExpression } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirStringConcatenationCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirStringConcatenationCallImpl.kt index 227aba8b027..8e81c9a64d6 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirStringConcatenationCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirStringConcatenationCallImpl.kt @@ -16,6 +16,8 @@ import org.jetbrains.kotlin.fir.expressions.FirStringConcatenationCall import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.impl.FirImplicitStringTypeRef import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -24,7 +26,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirStringConcatenationCallImpl( override val source: KtSourceElement?, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override var argumentList: FirArgumentList, ) : FirStringConcatenationCall() { override var typeRef: FirTypeRef = FirImplicitStringTypeRef(source?.fakeElement(KtFakeSourceElementKind.ImplicitTypeRef)) @@ -47,6 +49,10 @@ internal class FirStringConcatenationCallImpl( return this } + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } + override fun replaceArgumentList(newArgumentList: FirArgumentList) { argumentList = newArgumentList } 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 58eb2b1a508..70566980ae1 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 @@ -17,6 +17,8 @@ import org.jetbrains.kotlin.fir.references.FirThisReference import org.jetbrains.kotlin.fir.types.FirTypeProjection import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.FirImplementationDetail /* @@ -27,7 +29,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail internal class FirThisReceiverExpressionImpl( override var source: KtSourceElement?, override var typeRef: FirTypeRef, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override val contextReceiverArguments: MutableList, override val typeArguments: MutableList, override var calleeReference: FirThisReference, @@ -97,6 +99,10 @@ internal class FirThisReceiverExpressionImpl( typeRef = newTypeRef } + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } + override fun replaceContextReceiverArguments(newContextReceiverArguments: List) { contextReceiverArguments.clear() contextReceiverArguments.addAll(newContextReceiverArguments) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirThrowExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirThrowExpressionImpl.kt index b3c9aaeedec..2afd2894795 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirThrowExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirThrowExpressionImpl.kt @@ -16,6 +16,8 @@ import org.jetbrains.kotlin.fir.expressions.FirThrowExpression import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.impl.FirImplicitNothingTypeRef import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -24,7 +26,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirThrowExpressionImpl( override val source: KtSourceElement?, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override var exception: FirExpression, ) : FirThrowExpression() { override var typeRef: FirTypeRef = FirImplicitNothingTypeRef(source?.fakeElement(KtFakeSourceElementKind.ImplicitTypeRef)) @@ -50,4 +52,8 @@ internal class FirThrowExpressionImpl( override fun replaceTypeRef(newTypeRef: FirTypeRef) { typeRef = newTypeRef } + + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirTryExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirTryExpressionImpl.kt index 4353d40ba2e..5260bf37462 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirTryExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirTryExpressionImpl.kt @@ -15,6 +15,8 @@ import org.jetbrains.kotlin.fir.expressions.FirTryExpression import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -24,7 +26,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirTryExpressionImpl( override val source: KtSourceElement?, override var typeRef: FirTypeRef, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override var calleeReference: FirReference, override var tryBlock: FirBlock, override val catches: MutableList, @@ -83,6 +85,10 @@ internal class FirTryExpressionImpl( typeRef = newTypeRef } + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } + override fun replaceCalleeReference(newCalleeReference: FirReference) { calleeReference = newCalleeReference } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirTypeOperatorCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirTypeOperatorCallImpl.kt index 695253f5f8d..fa6bf70b485 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirTypeOperatorCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirTypeOperatorCallImpl.kt @@ -15,6 +15,8 @@ import org.jetbrains.kotlin.fir.expressions.FirTypeOperatorCall import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImpl import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -23,7 +25,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirTypeOperatorCallImpl( override val source: KtSourceElement?, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override var argumentList: FirArgumentList, override val operation: FirOperation, override var conversionTypeRef: FirTypeRef, @@ -64,6 +66,10 @@ internal class FirTypeOperatorCallImpl( typeRef = newTypeRef } + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } + override fun replaceArgumentList(newArgumentList: FirArgumentList) { argumentList = newArgumentList } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirUnitExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirUnitExpression.kt index d809e61a242..6361ca404c4 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirUnitExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirUnitExpression.kt @@ -16,6 +16,8 @@ import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.impl.FirImplicitUnitTypeRef import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -24,7 +26,7 @@ import org.jetbrains.kotlin.fir.visitors.* class FirUnitExpression @FirImplementationDetail constructor( override val source: KtSourceElement?, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, ) : FirExpression() { override var typeRef: FirTypeRef = FirImplicitUnitTypeRef(source?.fakeElement(KtFakeSourceElementKind.ImplicitTypeRef)) @@ -47,4 +49,8 @@ class FirUnitExpression @FirImplementationDetail constructor( override fun replaceTypeRef(newTypeRef: FirTypeRef) { typeRef = newTypeRef } + + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirVarargArgumentsExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirVarargArgumentsExpressionImpl.kt index 5c70a476989..532c333d516 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirVarargArgumentsExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirVarargArgumentsExpressionImpl.kt @@ -13,6 +13,8 @@ import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirVarargArgumentsExpression import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -22,7 +24,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirVarargArgumentsExpressionImpl( override val source: KtSourceElement?, override var typeRef: FirTypeRef, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override val arguments: MutableList, override var varargElementType: FirTypeRef, ) : FirVarargArgumentsExpression() { @@ -49,4 +51,8 @@ internal class FirVarargArgumentsExpressionImpl( override fun replaceTypeRef(newTypeRef: FirTypeRef) { typeRef = newTypeRef } + + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } } 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 d5a95263d4f..da1b97fd5ca 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 @@ -16,6 +16,8 @@ import org.jetbrains.kotlin.fir.types.FirTypeProjection import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImpl import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.FirImplementationDetail /* @@ -25,7 +27,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail internal class FirVariableAssignmentImpl( override var calleeReference: FirReference, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override val contextReceiverArguments: MutableList, override val typeArguments: MutableList, override var explicitReceiver: FirExpression?, @@ -103,6 +105,10 @@ internal class FirVariableAssignmentImpl( calleeReference = newCalleeReference } + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } + override fun replaceContextReceiverArguments(newContextReceiverArguments: List) { contextReceiverArguments.clear() contextReceiverArguments.addAll(newContextReceiverArguments) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhenExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhenExpressionImpl.kt index 96b1982f5e8..96caf1652e4 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhenExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhenExpressionImpl.kt @@ -17,6 +17,8 @@ import org.jetbrains.kotlin.fir.expressions.FirWhenExpression import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -26,7 +28,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirWhenExpressionImpl( override val source: KtSourceElement?, override var typeRef: FirTypeRef, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override var calleeReference: FirReference, override var subject: FirExpression?, override var subjectVariable: FirVariable?, @@ -90,6 +92,10 @@ internal class FirWhenExpressionImpl( typeRef = newTypeRef } + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } + override fun replaceCalleeReference(newCalleeReference: FirReference) { calleeReference = newCalleeReference } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhenSubjectExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhenSubjectExpressionImpl.kt index c0b75f10381..40f47ea710f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhenSubjectExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhenSubjectExpressionImpl.kt @@ -14,6 +14,8 @@ import org.jetbrains.kotlin.fir.expressions.FirWhenExpression import org.jetbrains.kotlin.fir.expressions.FirWhenSubjectExpression import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -22,7 +24,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirWhenSubjectExpressionImpl( override val source: KtSourceElement?, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override val whenRef: FirExpressionRef, ) : FirWhenSubjectExpression() { override val typeRef: FirTypeRef get() = whenRef.value.subject!!.typeRef @@ -42,4 +44,8 @@ internal class FirWhenSubjectExpressionImpl( } override fun replaceTypeRef(newTypeRef: FirTypeRef) {} + + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhileLoopImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhileLoopImpl.kt index fb6a74ce42f..786b799eb10 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhileLoopImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhileLoopImpl.kt @@ -14,6 +14,8 @@ import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirWhileLoop import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -22,7 +24,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirWhileLoopImpl( override val source: KtSourceElement?, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override var label: FirLabel?, override var condition: FirExpression, override var block: FirBlock, @@ -61,4 +63,8 @@ internal class FirWhileLoopImpl( label = label?.transform(transformer, data) return this } + + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWrappedDelegateExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWrappedDelegateExpressionImpl.kt index 06e504e4f47..845afc92bb4 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWrappedDelegateExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWrappedDelegateExpressionImpl.kt @@ -13,6 +13,8 @@ import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirWrappedDelegateExpression import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -21,7 +23,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirWrappedDelegateExpressionImpl( override val source: KtSourceElement?, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override var expression: FirExpression, override var delegateProvider: FirExpression, ) : FirWrappedDelegateExpression() { @@ -47,6 +49,10 @@ internal class FirWrappedDelegateExpressionImpl( override fun replaceTypeRef(newTypeRef: FirTypeRef) {} + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } + override fun replaceExpression(newExpression: FirExpression) { expression = newExpression } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/impl/FirFileAnnotationsContainerImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/impl/FirFileAnnotationsContainerImpl.kt index d7ddc415a77..2193a32f520 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/impl/FirFileAnnotationsContainerImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/impl/FirFileAnnotationsContainerImpl.kt @@ -14,6 +14,8 @@ import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.symbols.impl.FirFileSymbol import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -25,7 +27,7 @@ internal class FirFileAnnotationsContainerImpl( @Volatile override var resolvePhase: FirResolvePhase, override val moduleData: FirModuleData, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override val containingFileSymbol: FirFileSymbol, ) : FirFileAnnotationsContainer() { override fun acceptChildren(visitor: FirVisitor, data: D) { @@ -45,4 +47,8 @@ internal class FirFileAnnotationsContainerImpl( override fun replaceResolvePhase(newResolvePhase: FirResolvePhase) { resolvePhase = newResolvePhase } + + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirDynamicTypeRef.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirDynamicTypeRef.kt index 1e417637c35..d9d685f7654 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirDynamicTypeRef.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirDynamicTypeRef.kt @@ -26,5 +26,7 @@ abstract class FirDynamicTypeRef : FirTypeRefWithNullability() { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformDynamicTypeRef(this, data) as E + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirDynamicTypeRef } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirErrorTypeRef.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirErrorTypeRef.kt index fb8fc7e2291..e075820b945 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirErrorTypeRef.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirErrorTypeRef.kt @@ -31,5 +31,7 @@ abstract class FirErrorTypeRef : FirResolvedTypeRef(), FirDiagnosticHolder { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformErrorTypeRef(this, data) as E + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirErrorTypeRef } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirFunctionTypeRef.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirFunctionTypeRef.kt index 59bfc73b5da..e64e3e82478 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirFunctionTypeRef.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirFunctionTypeRef.kt @@ -32,5 +32,7 @@ abstract class FirFunctionTypeRef : FirTypeRefWithNullability() { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformFunctionTypeRef(this, data) as E + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirFunctionTypeRef } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirImplicitTypeRef.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirImplicitTypeRef.kt index 8a3a82ae34c..702397edce4 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirImplicitTypeRef.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirImplicitTypeRef.kt @@ -25,5 +25,7 @@ abstract class FirImplicitTypeRef : FirTypeRef() { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformImplicitTypeRef(this, data) as E + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirImplicitTypeRef } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirIntersectionTypeRef.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirIntersectionTypeRef.kt index bf2b6db6865..c48c2e97dac 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirIntersectionTypeRef.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirIntersectionTypeRef.kt @@ -28,5 +28,7 @@ abstract class FirIntersectionTypeRef : FirTypeRefWithNullability() { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformIntersectionTypeRef(this, data) as E + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirIntersectionTypeRef } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirResolvedTypeRef.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirResolvedTypeRef.kt index a92436f9731..92bd3d9ab16 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirResolvedTypeRef.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirResolvedTypeRef.kt @@ -28,5 +28,7 @@ abstract class FirResolvedTypeRef : FirTypeRef() { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformResolvedTypeRef(this, data) as E + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirResolvedTypeRef } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirTypeRef.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirTypeRef.kt index 3f163b3f979..6a08d57862b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirTypeRef.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirTypeRef.kt @@ -27,5 +27,7 @@ sealed class FirTypeRef : FirPureAbstractElement(), FirAnnotationContainer { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformTypeRef(this, data) as E + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirTypeRef } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirTypeRefWithNullability.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirTypeRefWithNullability.kt index 8da62de1092..6dc5d61b3df 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirTypeRefWithNullability.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirTypeRefWithNullability.kt @@ -26,5 +26,7 @@ abstract class FirTypeRefWithNullability : FirTypeRef() { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformTypeRefWithNullability(this, data) as E + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirTypeRefWithNullability } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirUserTypeRef.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirUserTypeRef.kt index a55dfc805b0..22063f90b2b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirUserTypeRef.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirUserTypeRef.kt @@ -28,5 +28,7 @@ abstract class FirUserTypeRef : FirTypeRefWithNullability() { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformUserTypeRef(this, data) as E + abstract override fun replaceAnnotations(newAnnotations: List) + abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirUserTypeRef } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirDynamicTypeRefBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirDynamicTypeRefBuilder.kt index edac7262f9b..9cea06e41ce 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirDynamicTypeRefBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirDynamicTypeRefBuilder.kt @@ -11,6 +11,7 @@ import kotlin.contracts.* import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.types.FirDynamicTypeRef import org.jetbrains.kotlin.fir.types.impl.FirDynamicTypeRefImpl @@ -30,7 +31,7 @@ class FirDynamicTypeRefBuilder : FirAnnotationContainerBuilder { override fun build(): FirDynamicTypeRef { return FirDynamicTypeRefImpl( source, - annotations, + annotations.toMutableOrEmpty(), isMarkedNullable, ) } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirFunctionTypeRefBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirFunctionTypeRefBuilder.kt index 592ecdc1ceb..0ad1b108c0c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirFunctionTypeRefBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirFunctionTypeRefBuilder.kt @@ -12,6 +12,7 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirFunctionTypeParameter import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.types.FirFunctionTypeRef import org.jetbrains.kotlin.fir.types.FirTypeRef @@ -37,7 +38,7 @@ class FirFunctionTypeRefBuilder : FirAnnotationContainerBuilder { override fun build(): FirFunctionTypeRef { return FirFunctionTypeRefImpl( source, - annotations, + annotations.toMutableOrEmpty(), isMarkedNullable, receiverTypeRef, parameters, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirImplicitTypeRefBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirImplicitTypeRefBuilder.kt index 79afe34100c..6e3a2b4da1d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirImplicitTypeRefBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirImplicitTypeRefBuilder.kt @@ -10,6 +10,7 @@ package org.jetbrains.kotlin.fir.types.builder import kotlin.contracts.* import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.types.FirImplicitTypeRef import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImpl diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirIntersectionTypeRefBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirIntersectionTypeRefBuilder.kt index dfca0559007..9ca8585d940 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirIntersectionTypeRefBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirIntersectionTypeRefBuilder.kt @@ -11,6 +11,7 @@ import kotlin.contracts.* import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.types.FirIntersectionTypeRef import org.jetbrains.kotlin.fir.types.FirTypeRef @@ -33,7 +34,7 @@ class FirIntersectionTypeRefBuilder : FirAnnotationContainerBuilder { override fun build(): FirIntersectionTypeRef { return FirIntersectionTypeRefImpl( source, - annotations, + annotations.toMutableOrEmpty(), isMarkedNullable, leftType, rightType, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirResolvedTypeRefBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirResolvedTypeRefBuilder.kt index c8293daa04d..dd5735780cd 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirResolvedTypeRefBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirResolvedTypeRefBuilder.kt @@ -12,6 +12,7 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef @@ -36,7 +37,7 @@ class FirResolvedTypeRefBuilder : FirAnnotationContainerBuilder { override fun build(): FirResolvedTypeRef { return FirResolvedTypeRefImpl( source, - annotations, + annotations.toMutableOrEmpty(), type, delegatedTypeRef, isFromStubType, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirDynamicTypeRefImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirDynamicTypeRefImpl.kt index 657d9ac4fe3..fe6ab42138d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirDynamicTypeRefImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirDynamicTypeRefImpl.kt @@ -11,6 +11,8 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.types.FirDynamicTypeRef import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -19,7 +21,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirDynamicTypeRefImpl( override val source: KtSourceElement?, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override val isMarkedNullable: Boolean, ) : FirDynamicTypeRef() { override fun acceptChildren(visitor: FirVisitor, data: D) { @@ -35,4 +37,8 @@ internal class FirDynamicTypeRefImpl( annotations.transformInplace(transformer, data) return this } + + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirFunctionTypeRefImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirFunctionTypeRefImpl.kt index 4ed0d5f9c6f..c8ffb4fa049 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirFunctionTypeRefImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirFunctionTypeRefImpl.kt @@ -13,6 +13,8 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.types.FirFunctionTypeRef import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -21,7 +23,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirFunctionTypeRefImpl( override val source: KtSourceElement?, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override val isMarkedNullable: Boolean, override var receiverTypeRef: FirTypeRef?, override val parameters: MutableList, @@ -50,4 +52,8 @@ internal class FirFunctionTypeRefImpl( annotations.transformInplace(transformer, data) return this } + + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirImplicitTypeRefImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirImplicitTypeRefImpl.kt index 096fff824bd..aa67a5fa7bd 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirImplicitTypeRefImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirImplicitTypeRefImpl.kt @@ -11,6 +11,8 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.types.FirImplicitTypeRef import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -32,4 +34,6 @@ internal class FirImplicitTypeRefImpl( override fun transformAnnotations(transformer: FirTransformer, data: D): FirImplicitTypeRefImpl { return this } + + override fun replaceAnnotations(newAnnotations: List) {} } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirIntersectionTypeRefImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirIntersectionTypeRefImpl.kt index 541870356aa..ecf4bc46315 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirIntersectionTypeRefImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirIntersectionTypeRefImpl.kt @@ -12,6 +12,8 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.types.FirIntersectionTypeRef import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -20,7 +22,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirIntersectionTypeRefImpl( override val source: KtSourceElement?, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override val isMarkedNullable: Boolean, override var leftType: FirTypeRef, override var rightType: FirTypeRef, @@ -42,4 +44,8 @@ internal class FirIntersectionTypeRefImpl( annotations.transformInplace(transformer, data) return this } + + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirResolvedTypeRefImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirResolvedTypeRefImpl.kt index 4fed39bddd3..642ea84d42c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirResolvedTypeRefImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirResolvedTypeRefImpl.kt @@ -14,6 +14,8 @@ import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty /* * This file was generated automatically @@ -22,7 +24,7 @@ import org.jetbrains.kotlin.fir.visitors.* class FirResolvedTypeRefImpl @FirImplementationDetail constructor( override val source: KtSourceElement?, - override val annotations: MutableList, + override var annotations: MutableOrEmptyList, override val type: ConeKotlinType, override var delegatedTypeRef: FirTypeRef?, override val isFromStubType: Boolean, @@ -40,4 +42,8 @@ class FirResolvedTypeRefImpl @FirImplementationDetail constructor( annotations.transformInplace(transformer, data) return this } + + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } } diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/Utils.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/Utils.kt index 6212703cac6..04cc7d6e7c1 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/Utils.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/Utils.kt @@ -144,3 +144,49 @@ inline fun withFileAnalysisExceptionWrapping(file: FirFile, block: () -> R): block, ) } + +@JvmInline +value class MutableOrEmptyList(val list: MutableList? = null) : List { + override val size: Int + get() = list?.size ?: 0 + + override fun get(index: Int): T { + return list!![index] + } + + override fun isEmpty(): Boolean { + return list?.isEmpty() ?: true + } + + override fun iterator(): Iterator { + return list?.iterator() ?: emptyList().iterator() + } + + override fun listIterator(): ListIterator { + return list?.listIterator() ?: emptyList().listIterator() + } + + override fun listIterator(index: Int): ListIterator { + return list?.listIterator(index) ?: emptyList().listIterator(index) + } + + override fun subList(fromIndex: Int, toIndex: Int): MutableList { + return list!!.subList(fromIndex, toIndex) + } + + override fun lastIndexOf(element: T): Int { + return list?.lastIndexOf(element) ?: -1 + } + + override fun indexOf(element: T): Int { + return list?.indexOf(element) ?: -1 + } + + override fun containsAll(elements: Collection): Boolean { + return list?.containsAll(elements) ?: elements.isEmpty() + } + + override fun contains(element: T): Boolean { + return list?.contains(element) ?: false + } +} diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/builder/FirBuilderDsl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/builder/FirBuilderDsl.kt index 1d6e78e193d..cad78d3029f 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/builder/FirBuilderDsl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/builder/FirBuilderDsl.kt @@ -5,5 +5,14 @@ package org.jetbrains.kotlin.fir.builder +import org.jetbrains.kotlin.fir.MutableOrEmptyList + @DslMarker annotation class FirBuilderDsl + +fun MutableList.toMutableOrEmpty(): MutableOrEmptyList = + if (isEmpty()) MutableOrEmptyList() else MutableOrEmptyList(this) + +@JvmName("toMutableOrEmptyForImmutable") +fun List.toMutableOrEmpty(): MutableOrEmptyList = + if (isEmpty()) MutableOrEmptyList() else MutableOrEmptyList(this.toMutableList()) diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultPropertyAccessor.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultPropertyAccessor.kt index 8a3331884c2..d49ac6b8e04 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultPropertyAccessor.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultPropertyAccessor.kt @@ -14,6 +14,7 @@ import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.fakeElement import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.FirModuleData +import org.jetbrains.kotlin.fir.MutableOrEmptyList import org.jetbrains.kotlin.fir.contracts.impl.FirEmptyContractDescription import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.builder.buildDefaultSetterValueParameter @@ -60,7 +61,7 @@ abstract class FirDefaultPropertyAccessor( symbol, propertySymbol, isGetter, - annotations = mutableListOf(), + annotations = MutableOrEmptyList(), typeParameters = mutableListOf(), ) { override val dispatchReceiverType: ConeSimpleKotlinType? diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultPropertyBackingField.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultPropertyBackingField.kt index 8d86e9db7ea..62bcec26aac 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultPropertyBackingField.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultPropertyBackingField.kt @@ -8,6 +8,7 @@ package org.jetbrains.kotlin.fir.declarations.impl import org.jetbrains.kotlin.builtins.StandardNames.BACKING_FIELD import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.FirModuleData +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.symbols.impl.FirBackingFieldSymbol @@ -44,7 +45,7 @@ class FirDefaultPropertyBackingField( symbol = FirBackingFieldSymbol(CallableId(BACKING_FIELD)), propertySymbol = propertySymbol, initializer = null, - annotations = annotations, + annotations = annotations.toMutableOrEmpty(), typeParameters = mutableListOf(), status = status, contextReceivers = mutableListOf(), diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticProperty.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticProperty.kt index 7adfbb977cb..187080b7d6f 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticProperty.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticProperty.kt @@ -182,6 +182,10 @@ class FirSyntheticProperty( notSupported() } + override fun replaceAnnotations(newAnnotations: List) { + notSupported() + } + private fun notSupported(): Nothing { throw AssertionError("Transformation of synthetic property isn't supported") } diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticPropertyAccessor.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticPropertyAccessor.kt index afe90597ac8..8ad3cba63c7 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticPropertyAccessor.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticPropertyAccessor.kt @@ -162,4 +162,8 @@ class FirSyntheticPropertyAccessor( override fun replaceContextReceivers(newContextReceivers: List) { throw AssertionError("Mutation of synthetic property accessor isn't supported") } + + override fun replaceAnnotations(newAnnotations: List) { + throw AssertionError("Mutation of synthetic property accessor isn't supported") + } } diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/builder/FirConstExpressionBuilder.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/builder/FirConstExpressionBuilder.kt index 0728802442e..c312d39e5e7 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/builder/FirConstExpressionBuilder.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/builder/FirConstExpressionBuilder.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.fir.expressions.builder import org.jetbrains.kotlin.KtSourceElement +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirConstExpression import org.jetbrains.kotlin.fir.expressions.impl.FirConstExpressionImpl @@ -19,7 +20,7 @@ fun buildConstExpression( annotations: MutableList = mutableListOf(), setType: Boolean = false ): FirConstExpression { - return FirConstExpressionImpl(source, annotations, kind, value).also { + return FirConstExpressionImpl(source, annotations.toMutableOrEmpty(), kind, value).also { if (setType) { when (value) { null -> it.typeRef = FirImplicitNullableAnyTypeRef(null) diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirAnonymousFunctionExpressionImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirAnonymousFunctionExpressionImpl.kt index fd52a853276..3f8ed98fd8a 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirAnonymousFunctionExpressionImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirAnonymousFunctionExpressionImpl.kt @@ -31,6 +31,10 @@ internal class FirAnonymousFunctionExpressionImpl( return transformAnonymousFunction(transformer, data) } + override fun replaceAnnotations(newAnnotations: List) { + anonymousFunction.replaceAnnotations(newAnnotations) + } + override fun transformAnnotations(transformer: FirTransformer, data: D): FirAnonymousFunctionExpressionImpl { return this } diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirAnonymousObjectExpressionImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirAnonymousObjectExpressionImpl.kt index 32e60c82e4e..8d78d989430 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirAnonymousObjectExpressionImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirAnonymousObjectExpressionImpl.kt @@ -37,6 +37,10 @@ internal class FirAnonymousObjectExpressionImpl( return this } + override fun replaceAnnotations(newAnnotations: List) { + anonymousObject.replaceAnnotations(newAnnotations) + } + override fun transformAnnotations(transformer: FirTransformer, data: D): FirAnonymousObjectExpressionImpl { return this } diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirNoReceiverExpression.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirNoReceiverExpression.kt index 16195cd91fd..08ed1bb009b 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirNoReceiverExpression.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirNoReceiverExpression.kt @@ -24,6 +24,10 @@ object FirNoReceiverExpression : FirExpression() { return this } + override fun replaceAnnotations(newAnnotations: List) { + throw AssertionError("Mutating annotations of FirNoReceiverExpression is not supported") + } + override fun transformAnnotations(transformer: FirTransformer, data: D): FirExpression { return this } diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirSingleExpressionBlock.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirSingleExpressionBlock.kt index cfdb9b03d4b..912405c5a51 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirSingleExpressionBlock.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirSingleExpressionBlock.kt @@ -8,6 +8,8 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fakeElement +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirStatement @@ -23,7 +25,7 @@ class FirSingleExpressionBlock( ) : FirBlock() { override val source: KtSourceElement? get() = statement.source?.fakeElement(KtFakeSourceElementKind.SingleExpressionBlock) - override val annotations: MutableList = mutableListOf() + override var annotations: MutableOrEmptyList = MutableOrEmptyList() override val statements: List get() = listOf(statement) override var typeRef: FirTypeRef = FirImplicitTypeRefImpl(null) @@ -54,6 +56,10 @@ class FirSingleExpressionBlock( return this } + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } + override fun transformAnnotations(transformer: FirTransformer, data: D): FirBlock { annotations.transformInplace(transformer, data) return this diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirStubStatement.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirStubStatement.kt index c7025719c43..ba8c5f9a495 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirStubStatement.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirStubStatement.kt @@ -20,6 +20,10 @@ object FirStubStatement : FirPureAbstractElement(), FirStatement { override val annotations: List get() = emptyList() + override fun replaceAnnotations(newAnnotations: List) { + throw AssertionError("Mutating annotations of FirStubStatement is not supported") + } + override fun transformAnnotations(transformer: FirTransformer, data: D): FirStatement { return this } diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/builder/FirUserTypeRefBuilder.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/builder/FirUserTypeRefBuilder.kt index a8274041aa1..6b014e6fea1 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/builder/FirUserTypeRefBuilder.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/builder/FirUserTypeRefBuilder.kt @@ -8,6 +8,7 @@ package org.jetbrains.kotlin.fir.types.builder import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.types.FirQualifierPart import org.jetbrains.kotlin.fir.types.FirUserTypeRef @@ -22,7 +23,7 @@ open class FirUserTypeRefBuilder : FirAnnotationContainerBuilder { val qualifier: MutableList = mutableListOf() override fun build(): FirUserTypeRef { - return FirUserTypeRefImpl(source, isMarkedNullable, qualifier, annotations) + return FirUserTypeRefImpl(source, isMarkedNullable, qualifier, annotations.toMutableOrEmpty()) } } diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirErrorTypeRefImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirErrorTypeRefImpl.kt index 88adc89f1fc..b3d76d2c485 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirErrorTypeRefImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirErrorTypeRefImpl.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.fir.types.impl import org.jetbrains.kotlin.KtSourceElement +import org.jetbrains.kotlin.fir.MutableOrEmptyList import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.types.ConeErrorType @@ -31,7 +32,7 @@ internal class FirErrorTypeRefImpl( isFromStubType ) - override val annotations: MutableList = mutableListOf() + override val annotations: MutableOrEmptyList = MutableOrEmptyList() override fun acceptChildren(visitor: FirVisitor, data: D) { annotations.forEach { it.accept(visitor, data) } @@ -42,6 +43,10 @@ internal class FirErrorTypeRefImpl( return this } + override fun replaceAnnotations(newAnnotations: List) { + throw AssertionError("Replacing annotations in FirErrorTypeRefImpl is not supported") + } + override fun transformAnnotations(transformer: FirTransformer, data: D): FirErrorTypeRefImpl { annotations.transformInplace(transformer, data) return this diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirImplicitBuiltinTypeRef.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirImplicitBuiltinTypeRef.kt index a010a16bca2..bbb5fb9dc63 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirImplicitBuiltinTypeRef.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirImplicitBuiltinTypeRef.kt @@ -43,6 +43,10 @@ sealed class FirImplicitBuiltinTypeRef( return this } + override fun replaceAnnotations(newAnnotations: List) { + throw AssertionError("Replacing annotations in FirImplicitBuiltinTypeRef is not supported") + } + override fun transformAnnotations(transformer: FirTransformer, data: D): FirResolvedTypeRef { return this } diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirUserTypeRefImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirUserTypeRefImpl.kt index 75c8086e804..39ad0e44e9e 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirUserTypeRefImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirUserTypeRefImpl.kt @@ -6,6 +6,8 @@ package org.jetbrains.kotlin.fir.types.impl import org.jetbrains.kotlin.KtSourceElement +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.types.FirQualifierPart import org.jetbrains.kotlin.fir.types.FirTypeProjection @@ -18,7 +20,7 @@ class FirUserTypeRefImpl( override var source: KtSourceElement?, override val isMarkedNullable: Boolean, override val qualifier: MutableList, - override val annotations: MutableList + override var annotations: MutableOrEmptyList ) : FirUserTypeRef() { override val customRenderer: Boolean get() = false @@ -38,6 +40,10 @@ class FirUserTypeRefImpl( return this } + override fun replaceAnnotations(newAnnotations: List) { + annotations = newAnnotations.toMutableOrEmpty() + } + override fun transformAnnotations(transformer: FirTransformer, data: D): FirUserTypeRef { annotations.transformInplace(transformer, data) return this 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 fcd1d9ec662..564d0442a71 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 @@ -7,6 +7,8 @@ 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) @@ -23,6 +25,10 @@ fun MutableList.transformInplace(transformer: FirTransfor } } +fun MutableOrEmptyList.transformInplace(transformer: FirTransformer, data: D) { + list?.transformInplace(transformer, data) +} + sealed class TransformData { class Data(val value: D) : TransformData() object Nothing : TransformData() diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/FieldSets.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/FieldSets.kt index 474b5af5d8e..8d9ff839da2 100644 --- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/FieldSets.kt +++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/FieldSets.kt @@ -37,7 +37,11 @@ object FieldSets { val declarations by lazy { fieldList(declaration.withArgs("E" to "*")) } - val annotations by lazy { fieldList("annotations", annotation).withTransform(needTransformInOtherChildren = true) } + val annotations by lazy { + fieldList( + "annotations", annotation, withReplace = true, useMutableOrEmpty = true + ).withTransform(needTransformInOtherChildren = true) + } fun symbolWithPackage(packageName: String?, symbolClassName: String, argument: String? = null): Field { return field("symbol", type(packageName, symbolClassName), argument) diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/ImplementationConfigurator.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/ImplementationConfigurator.kt index 2ce4ce1bdde..b497aa2c8a9 100644 --- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/ImplementationConfigurator.kt +++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/ImplementationConfigurator.kt @@ -195,7 +195,7 @@ object ImplementationConfigurator : AbstractFirTreeImplementationConfigurator() impl(errorLoop) { default("block", "FirEmptyExpressionBlock()") - default("condition", "FirErrorExpressionImpl(source, mutableListOf(), ConeStubDiagnostic(diagnostic), null, null)") + default("condition", "FirErrorExpressionImpl(source, MutableOrEmptyList(), ConeStubDiagnostic(diagnostic), null, null)") useTypes(emptyExpressionBlock, coneStubDiagnosticType) } diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/model/ElementUtils.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/model/ElementUtils.kt index a385d04abc9..9e1c74ce1fb 100644 --- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/model/ElementUtils.kt +++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/model/ElementUtils.kt @@ -62,8 +62,8 @@ fun field(element: Element, nullable: Boolean = false, withReplace: Boolean = fa // ----------- Field list ----------- -fun fieldList(name: String, type: Importable, withReplace: Boolean = false): Field { - return FieldList(name, type, withReplace) +fun fieldList(name: String, type: Importable, withReplace: Boolean = false, useMutableOrEmpty: Boolean = false): Field { + return FieldList(name, type, withReplace, useMutableOrEmpty) } fun fieldList(element: AbstractElement, withReplace: Boolean = false): Field { diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/model/Field.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/model/Field.kt index 9edbbf07433..65e13576199 100644 --- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/model/Field.kt +++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/model/Field.kt @@ -22,6 +22,7 @@ sealed class Field : Importable { open val defaultValueInImplementation: String? get() = null abstract var isMutable: Boolean + abstract var isMutableOrEmpty: Boolean open var isMutableInInterface: Boolean = false open val withGetter: Boolean get() = false open val customSetter: String? get() = null @@ -98,6 +99,7 @@ class FieldWithDefault(val origin: Field) : Field() { override var defaultValueInImplementation: String? = origin.defaultValueInImplementation var defaultValueInBuilder: String? = null override var isMutable: Boolean = origin.isMutable + override var isMutableOrEmpty: Boolean = origin.isMutableOrEmpty override var isMutableInInterface: Boolean = origin.isMutableInInterface override var withGetter: Boolean = false override var customSetter: String? = null @@ -135,6 +137,7 @@ class SimpleField( get() = customType?.fullQualifiedName ?: super.fullQualifiedName override var isMutable: Boolean = withReplace + override var isMutableOrEmpty: Boolean = false override fun internalCopy(): Field { return SimpleField( @@ -182,6 +185,7 @@ class FirField( override val isFirType: Boolean = true override var isMutable: Boolean = true + override var isMutableOrEmpty: Boolean = false override fun internalCopy(): Field { return FirField( @@ -200,7 +204,8 @@ class FirField( class FieldList( override val name: String, val baseType: Importable, - override var withReplace: Boolean + override var withReplace: Boolean, + useMutableOrEmpty: Boolean = false ) : Field() { override var defaultValueInImplementation: String? = null override val packageName: String? get() = baseType.packageName @@ -212,12 +217,14 @@ class FieldList( override var isVolatile: Boolean = false override var isMutable: Boolean = true + override var isMutableOrEmpty: Boolean = useMutableOrEmpty override fun internalCopy(): Field { return FieldList( name, baseType, - withReplace + withReplace, + isMutableOrEmpty ) } diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/builder.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/builder.kt index feac6ccc2fe..113696f2d89 100644 --- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/builder.kt +++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/builder.kt @@ -83,7 +83,9 @@ private fun SmartPrinter.printBuilder(builder: Builder) { withIndent { for (field in builder.allFields) { val name = field.name - println(name, ",") + print(name) + if (field.isMutableOrEmpty) print(".toMutableOrEmpty()") + println(",") } } println(")") @@ -210,7 +212,7 @@ private fun SmartPrinter.printDeprecationOnUselessFieldIfNeeded(field: Field, bu private fun SmartPrinter.printFieldListInBuilder(field: FieldList, builder: Builder, fieldIsUseless: Boolean) { printDeprecationOnUselessFieldIfNeeded(field, builder, fieldIsUseless) printModifiers(builder, field, fieldIsUseless) - print("val ${field.name}: ${field.mutableType}") + print("val ${field.name}: ${field.getMutableType(forBuilder = true)}") if (builder is LeafBuilder) { print(" = mutableListOf()") } diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/field.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/field.kt index a4ce7590d1c..13e5998f339 100644 --- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/field.kt +++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/field.kt @@ -22,7 +22,7 @@ fun SmartPrinter.printField(field: Field, isImplementation: Boolean, override: B } else { print("var") } - val type = if (isImplementation) field.mutableType else field.typeWithArguments + val type = if (isImplementation) field.getMutableType() else field.typeWithArguments println(" ${field.name}: $type$end") } @@ -37,7 +37,7 @@ fun SmartPrinter.printFieldWithDefaultInImplementation(field: Field) { } else { print("var") } - print(" ${field.name}: ${field.mutableType} ") + print(" ${field.name}: ${field.getMutableType()} ") if (field.withGetter) { if (field.customSetter != null) { println() diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/implementation.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/implementation.kt index 0cadc98f07b..314e64e3df7 100644 --- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/implementation.kt +++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/implementation.kt @@ -343,7 +343,7 @@ fun SmartPrinter.printImplementation(implementation: Implementation) { when { field.withGetter -> {} - field.origin is FieldList -> { + field.origin is FieldList && !field.isMutableOrEmpty -> { println("${field.name}.clear()") println("${field.name}.addAll($newValue)") } @@ -352,7 +352,11 @@ fun SmartPrinter.printImplementation(implementation: Implementation) { if (field.useNullableForReplace) { println("require($newValue != null)") } - println("${field.name} = $newValue") + print("${field.name} = $newValue") + if (field.origin is FieldList && field.isMutableOrEmpty) { + print(".toMutableOrEmpty()") + } + println() } } } diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/utils.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/utils.kt index 7ec32488453..15e7f29a478 100644 --- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/utils.kt +++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/utils.kt @@ -67,7 +67,19 @@ private fun Element.collectImportsInternal(base: List, kind: ImportKind) allFields.flatMap { it.overridenTypes.mapNotNull { it.fullQualifiedName } } + allFields.flatMap { it.arguments.mapNotNull { it.fullQualifiedName } } + typeArguments.flatMap { it.upperBounds.mapNotNull { it.fullQualifiedName } } - val result = fqns.filterRedundantImports(packageName, kind) + val result = fqns.filterRedundantImports(packageName, kind) + + if (allFields.any { it is FieldList && it.isMutableOrEmpty }) { + when (kind) { + ImportKind.Implementation -> listOf( + "org.jetbrains.kotlin.fir.MutableOrEmptyList", + "org.jetbrains.kotlin.fir.builder.toMutableOrEmpty" + ) + ImportKind.Builder -> listOf("org.jetbrains.kotlin.fir.builder.toMutableOrEmpty") + else -> emptyList() + } + } else { + emptyList() + } if (allFields.any { it.name == "source" && it.withReplace }) { return (result + "org.jetbrains.kotlin.fir.FirImplementationDetail").distinct() } @@ -89,7 +101,8 @@ val KindOwner.needPureAbstractElement: Boolean get() = (kind != Kind.Interface && kind != Kind.SealedInterface) && !allParents.any { it.kind == Kind.AbstractClass || it.kind == Kind.SealedClass } -val Field.isVal: Boolean get() = this is FieldList || (this is FieldWithDefault && origin is FieldList) || !isMutable +val Field.isVal: Boolean + get() = (this is FieldList && !isMutableOrEmpty) || (this is FieldWithDefault && origin is FieldList && !origin.isMutableOrEmpty) || !isMutable fun Field.transformFunctionDeclaration(returnType: String): String { @@ -109,12 +122,15 @@ fun Field.replaceFunctionDeclaration(overridenType: Importable? = null, forceNul return "fun replace$capName(new$capName: $typeWithNullable)" } -val Field.mutableType: String - get() = when (this) { - is FieldList -> if (isMutable) "Mutable$typeWithArguments" else typeWithArguments - is FieldWithDefault -> if (isMutable) origin.mutableType else typeWithArguments +fun Field.getMutableType(forBuilder: Boolean = false): String = when (this) { + is FieldList -> when { + isMutableOrEmpty && !forBuilder -> "MutableOrEmpty$typeWithArguments" + isMutable -> "Mutable$typeWithArguments" else -> typeWithArguments } + is FieldWithDefault -> if (isMutable) origin.getMutableType() else typeWithArguments + else -> typeWithArguments +} fun Field.call(): String = if (nullable) "?." else "."