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 58313500876..e4d4829dfb6 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 @@ -102,7 +102,7 @@ fun deserializeClassToSymbol( } } buildRegularClass { - this.session = session + declarationSiteSession = session this.origin = origin name = classId.shortClassName this.status = status @@ -159,7 +159,7 @@ fun deserializeClassToSymbol( val enumType = ConeClassLikeTypeImpl(symbol.toLookupTag(), emptyArray(), false) val property = buildEnumEntry { - this.session = session + declarationSiteSession = session this.origin = FirDeclarationOrigin.Library returnTypeRef = buildResolvedTypeRef { type = enumType } name = enumEntryName @@ -255,7 +255,7 @@ private fun FirRegularClassBuilder.addCloneForArrayIfNeeded(classId: ClassId, di ) } declarations += buildSimpleFunction { - session = this@addCloneForArrayIfNeeded.session + declarationSiteSession = this@addCloneForArrayIfNeeded.declarationSiteSession origin = FirDeclarationOrigin.Library resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES returnTypeRef = buildResolvedTypeRef { 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 c19379014cb..625ab1b1b39 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 @@ -175,7 +175,7 @@ class FirMemberDeserializer(private val c: FirDeserializationContext) { val local = c.childContext(proto.typeParameterList) val classId = ClassId(c.packageFqName, name) return buildTypeAlias { - session = c.session + declarationSiteSession = c.session origin = FirDeclarationOrigin.Library this.name = name val visibility = ProtoEnumFlags.visibility(Flags.VISIBILITY.get(flags)) @@ -236,7 +236,7 @@ class FirMemberDeserializer(private val c: FirDeserializationContext) { val modality = ProtoEnumFlags.modality(Flags.MODALITY.get(getterFlags)) if (Flags.IS_NOT_DEFAULT.get(getterFlags)) { buildPropertyAccessor { - session = c.session + declarationSiteSession = c.session origin = FirDeclarationOrigin.Library this.returnTypeRef = returnTypeRef resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES @@ -272,7 +272,7 @@ class FirMemberDeserializer(private val c: FirDeserializationContext) { val modality = ProtoEnumFlags.modality(Flags.MODALITY.get(setterFlags)) if (Flags.IS_NOT_DEFAULT.get(setterFlags)) { buildPropertyAccessor { - session = c.session + declarationSiteSession = c.session origin = FirDeclarationOrigin.Library this.returnTypeRef = FirImplicitUnitTypeRef(source) resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES @@ -310,7 +310,7 @@ class FirMemberDeserializer(private val c: FirDeserializationContext) { val isVar = Flags.IS_VAR.get(flags) return buildProperty { - session = c.session + declarationSiteSession = c.session origin = FirDeclarationOrigin.Library this.returnTypeRef = returnTypeRef receiverTypeRef = proto.receiverType(c.typeTable)?.toTypeRef(local).apply { @@ -378,7 +378,7 @@ class FirMemberDeserializer(private val c: FirDeserializationContext) { val local = c.childContext(proto.typeParameterList) val simpleFunction = buildSimpleFunction { - session = c.session + declarationSiteSession = c.session origin = FirDeclarationOrigin.Library returnTypeRef = proto.returnType(local.typeTable).toTypeRef(local) receiverTypeRef = proto.receiverType(local.typeTable)?.toTypeRef(local).apply { @@ -453,7 +453,7 @@ class FirMemberDeserializer(private val c: FirDeserializationContext) { } else { FirConstructorBuilder() }.apply { - session = c.session + declarationSiteSession = c.session origin = FirDeclarationOrigin.Library returnTypeRef = delegatedSelfType val visibility = ProtoEnumFlags.visibility(Flags.VISIBILITY.get(flags)) @@ -506,7 +506,7 @@ class FirMemberDeserializer(private val c: FirDeserializationContext) { val flags = if (proto.hasFlags()) proto.flags else 0 val name = c.nameResolver.getName(proto.name) buildValueParameter { - session = c.session + declarationSiteSession = c.session origin = FirDeclarationOrigin.Library returnTypeRef = proto.type(c.typeTable).toTypeRef(c) this.name = name diff --git a/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/FirTypeDeserializer.kt b/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/FirTypeDeserializer.kt index c068edae022..28625e56f59 100644 --- a/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/FirTypeDeserializer.kt +++ b/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/FirTypeDeserializer.kt @@ -66,7 +66,7 @@ class FirTypeDeserializer( typeParameterNames[name.asString()] = it } builders += FirTypeParameterBuilder().apply { - session = this@FirTypeDeserializer.session + declarationSiteSession = session origin = FirDeclarationOrigin.Library this.name = name this.symbol = symbol diff --git a/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirBuiltinSymbolProvider.kt b/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirBuiltinSymbolProvider.kt index 1f012251c52..d3451d469c7 100644 --- a/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirBuiltinSymbolProvider.kt +++ b/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirBuiltinSymbolProvider.kt @@ -86,7 +86,7 @@ open class FirBuiltinSymbolProvider(session: FirSession, val kotlinScopeProvider syntheticFunctionalInterfaceSymbols.getOrPut(SyntheticFunctionalInterfaceSymbolKey(kind, arity)) { FirRegularClassSymbol(this).apply symbol@{ buildRegularClass klass@{ - session = this@FirBuiltinSymbolProvider.session + declarationSiteSession = session origin = FirDeclarationOrigin.BuiltIns name = relativeClassName.shortName() status = FirResolvedDeclarationStatusImpl( @@ -108,7 +108,7 @@ open class FirBuiltinSymbolProvider(session: FirSession, val kotlinScopeProvider typeParameters.addAll( (1..arity).map { buildTypeParameter { - session = this@FirBuiltinSymbolProvider.session + declarationSiteSession = session resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES origin = FirDeclarationOrigin.BuiltIns name = Name.identifier("P$it") @@ -121,7 +121,7 @@ open class FirBuiltinSymbolProvider(session: FirSession, val kotlinScopeProvider ) typeParameters.add( buildTypeParameter { - session = this@FirBuiltinSymbolProvider.session + declarationSiteSession = session resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES origin = FirDeclarationOrigin.BuiltIns name = Name.identifier("R") @@ -197,7 +197,7 @@ open class FirBuiltinSymbolProvider(session: FirSession, val kotlinScopeProvider } addDeclaration( buildSimpleFunction { - session = this@FirBuiltinSymbolProvider.session + declarationSiteSession = session resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES origin = FirDeclarationOrigin.BuiltIns returnTypeRef = typeArguments.last() @@ -210,7 +210,7 @@ open class FirBuiltinSymbolProvider(session: FirSession, val kotlinScopeProvider valueParameters += typeArguments.dropLast(1).mapIndexed { index, typeArgument -> val parameterName = Name.identifier("p${index + 1}") buildValueParameter { - session = this@FirBuiltinSymbolProvider.session + declarationSiteSession = session origin = FirDeclarationOrigin.BuiltIns resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES returnTypeRef = typeArgument diff --git a/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirMetadataSerializer.kt b/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirMetadataSerializer.kt index e4505cc194b..d0ec6343240 100644 --- a/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirMetadataSerializer.kt +++ b/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirMetadataSerializer.kt @@ -79,7 +79,7 @@ class FirMetadataSerializer( val function = this return buildAnonymousFunction { val typeParameterSet = function.typeParameters.filterIsInstanceTo(mutableSetOf()) - session = function.declarationSiteSession + declarationSiteSession = function.declarationSiteSession origin = FirDeclarationOrigin.Source symbol = FirAnonymousFunctionSymbol() returnTypeRef = function.returnTypeRef.approximated(toSuper = true, typeParameterSet) @@ -98,7 +98,7 @@ class FirMetadataSerializer( val accessor = this return buildPropertyAccessor { val typeParameterSet = accessor.typeParameters.toMutableSet() - session = accessor.declarationSiteSession + declarationSiteSession = accessor.declarationSiteSession origin = FirDeclarationOrigin.Source returnTypeRef = accessor.returnTypeRef.approximated(toSuper = true, typeParameterSet) symbol = FirPropertyAccessorSymbol() @@ -118,7 +118,7 @@ class FirMetadataSerializer( val property = this return buildProperty { val typeParameterSet = property.typeParameters.toMutableSet() - session = property.declarationSiteSession + declarationSiteSession = property.declarationSiteSession origin = FirDeclarationOrigin.Source symbol = FirPropertySymbol(property.symbol.callableId) returnTypeRef = property.returnTypeRef.approximated(toSuper = true, typeParameterSet) diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt index cc8450322c3..83dfdd03767 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt @@ -739,7 +739,7 @@ class Fir2IrDeclarationStorage( val field = this return buildProperty { source = field.source - session = field.declarationSiteSession + declarationSiteSession = field.declarationSiteSession origin = field.origin returnTypeRef = field.returnTypeRef name = field.name diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrVisitor.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrVisitor.kt index bb2ee2cb518..e33244443c5 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrVisitor.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrVisitor.kt @@ -566,7 +566,7 @@ class Fir2IrVisitor( override fun visitElvisExpression(elvisExpression: FirElvisExpression, data: Any?): IrElement { val firLhsVariable = buildProperty { source = elvisExpression.source - session = this@Fir2IrVisitor.session + declarationSiteSession = session origin = FirDeclarationOrigin.Source returnTypeRef = elvisExpression.lhs.typeRef name = Name.special("") diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/DataClassMembersGenerator.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/DataClassMembersGenerator.kt index 198b3846b9b..696d6aa75f8 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/DataClassMembersGenerator.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/DataClassMembersGenerator.kt @@ -263,7 +263,7 @@ class DataClassMembersGenerator(val components: Fir2IrComponents) { this.name = name this.symbol = FirNamedFunctionSymbol(CallableId(lookupTag.classId, name)) this.status = FirDeclarationStatusImpl(Visibilities.Public, Modality.FINAL) - this.session = components.session + declarationSiteSession = components.session this.returnTypeRef = when (returnType) { components.irBuiltIns.booleanType -> FirImplicitBooleanTypeRef(null) components.irBuiltIns.intType -> FirImplicitIntTypeRef(null) @@ -275,7 +275,7 @@ class DataClassMembersGenerator(val components: Fir2IrComponents) { buildValueParameter { this.name = Name.identifier("other") origin = FirDeclarationOrigin.Synthetic - this.session = components.session + declarationSiteSession = components.session this.returnTypeRef = FirImplicitNullableAnyTypeRef(null) this.symbol = FirVariableSymbol(this.name) isCrossinline = false diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaSymbolProvider.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaSymbolProvider.kt index b2470753973..f815e5e4603 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaSymbolProvider.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaSymbolProvider.kt @@ -103,7 +103,7 @@ class JavaSymbolProvider( javaTypeParameterStack: JavaTypeParameterStack ): FirTypeParameter { return FirTypeParameterBuilder().apply { - this.session = this@JavaSymbolProvider.session + declarationSiteSession = session origin = FirDeclarationOrigin.Java this.name = this@toFirTypeParameter.name symbol = firSymbol @@ -230,7 +230,7 @@ class JavaSymbolProvider( val classIsAnnotation = javaClass.classKind == ClassKind.ANNOTATION_CLASS return buildJavaClass { source = (javaClass as? JavaElementImpl<*>)?.psi?.toFirPsiSourceElement() - session = this@JavaSymbolProvider.session + declarationSiteSession = session symbol = classSymbol name = javaClass.name val visibility = javaClass.visibility @@ -373,7 +373,7 @@ class JavaSymbolProvider( return when { javaField.isEnumEntry -> buildEnumEntry { source = (javaField as? JavaElementImpl<*>)?.psi?.toFirPsiSourceElement() - session = this@JavaSymbolProvider.session + declarationSiteSession = session symbol = FirVariableSymbol(fieldId) name = fieldName status = FirResolvedDeclarationStatusImpl( @@ -395,7 +395,7 @@ class JavaSymbolProvider( } else -> buildJavaField { source = (javaField as? JavaElementImpl<*>)?.psi?.toFirPsiSourceElement() - session = this@JavaSymbolProvider.session + declarationSiteSession = session symbol = FirFieldSymbol(fieldId) name = fieldName status = FirResolvedDeclarationStatusImpl( @@ -443,7 +443,7 @@ class JavaSymbolProvider( val methodSymbol = FirNamedFunctionSymbol(methodId) val returnType = javaMethod.returnType return buildJavaMethod { - session = this@JavaSymbolProvider.session + declarationSiteSession = session source = (javaMethod as? JavaElementImpl<*>)?.psi?.toFirPsiSourceElement() symbol = methodSymbol name = methodName @@ -491,7 +491,7 @@ class JavaSymbolProvider( buildJavaValueParameter { source = (javaMethod as? JavaElementImpl<*>)?.psi ?.toFirPsiSourceElement(FirFakeSourceElementKind.ImplicitJavaAnnotationConstructor) - session = this@JavaSymbolProvider.session + declarationSiteSession = session returnTypeRef = firJavaMethod.returnTypeRef name = javaMethod.name isVararg = javaMethod.returnType is JavaArrayType && javaMethod.name == VALUE_METHOD_NAME @@ -509,7 +509,7 @@ class JavaSymbolProvider( val constructorSymbol = FirConstructorSymbol(constructorId) return buildJavaConstructor { source = (javaConstructor as? JavaElementImpl<*>)?.psi?.toFirPsiSourceElement() - session = this@JavaSymbolProvider.session + declarationSiteSession = session symbol = constructorSymbol isInner = javaClass.outerClass != null && !javaClass.isStatic val isThisInner = this.isInner @@ -555,7 +555,7 @@ class JavaSymbolProvider( ): FirJavaConstructor { return buildJavaConstructor { source = classSource - session = this@JavaSymbolProvider.session + declarationSiteSession = session symbol = FirConstructorSymbol(constructorId) status = FirResolvedDeclarationStatusImpl(Visibilities.Public, Modality.FINAL, EffectiveVisibility.Public) returnTypeRef = buildResolvedTypeRef { diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaUtils.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaUtils.kt index 96f237cb3fa..1017338c385 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaUtils.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaUtils.kt @@ -586,7 +586,7 @@ internal fun JavaValueParameter.toFirValueParameter( ): FirValueParameter { return buildJavaValueParameter { source = (this@toFirValueParameter as? JavaElementImpl<*>)?.psi?.toFirPsiSourceElement() - this.session = session + declarationSiteSession = session name = this@toFirValueParameter.name ?: Name.identifier("p$index") returnTypeRef = type.toFirJavaTypeRef(session, javaTypeParameterStack) isVararg = this@toFirValueParameter.isVararg 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 9172a207d88..e261254efd0 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 @@ -140,7 +140,7 @@ internal class FirJavaClassBuilder : FirRegularClassBuilder(), FirAnnotationCont override fun build(): FirJavaClass { return FirJavaClass( source, - session, + declarationSiteSession, resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES, name, annotations, 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 1c5ac189075..0991532ce57 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 @@ -151,7 +151,7 @@ class FirJavaConstructorBuilder : FirConstructorBuilder() { override fun build(): FirJavaConstructor { return FirJavaConstructor( source, - session, + declarationSiteSession, symbol, isPrimary, returnTypeRef, 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 1a99535ca9f..b42245b24c4 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 @@ -156,7 +156,7 @@ internal class FirJavaFieldBuilder : FirFieldBuilder() { override fun build(): FirJavaField { return FirJavaField( source, - session, + declarationSiteSession, symbol as FirFieldSymbol, name, resolvePhase, 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 b457c268c2d..35513031987 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 @@ -181,7 +181,7 @@ val ALL_JAVA_OPERATION_NAMES = @FirBuilderDsl class FirJavaMethodBuilder : FirFunctionBuilder, FirTypeParametersOwnerBuilder, FirAnnotationContainerBuilder { override var source: FirSourceElement? = null - override lateinit var session: FirSession + override lateinit var declarationSiteSession: FirSession override var attributes: FirDeclarationAttributes = FirDeclarationAttributes() override lateinit var returnTypeRef: FirTypeRef override val valueParameters: MutableList = mutableListOf() @@ -209,7 +209,7 @@ class FirJavaMethodBuilder : FirFunctionBuilder, FirTypeParametersOwnerBuilder, override fun build(): FirJavaMethod { return FirJavaMethod( source, - session, + declarationSiteSession, resolvePhase, attributes, returnTypeRef as FirJavaTypeRef, @@ -235,7 +235,7 @@ inline fun buildJavaMethodCopy(original: FirSimpleFunction, init: FirJavaMethodB } val copyBuilder = FirJavaMethodBuilder() copyBuilder.source = original.source - copyBuilder.session = original.declarationSiteSession + copyBuilder.declarationSiteSession = original.declarationSiteSession copyBuilder.resolvePhase = original.resolvePhase copyBuilder.attributes = original.attributes.copy() copyBuilder.returnTypeRef = original.returnTypeRef 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 cb17e5dc3bb..6975935de16 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 @@ -146,7 +146,7 @@ class FirJavaValueParameter @FirImplementationDetail constructor( @FirBuilderDsl class FirJavaValueParameterBuilder { var source: FirSourceElement? = null - lateinit var session: FirSession + lateinit var declarationSiteSession: FirSession var attributes: FirDeclarationAttributes = FirDeclarationAttributes() lateinit var returnTypeRef: FirTypeRef lateinit var name: Name @@ -158,7 +158,7 @@ class FirJavaValueParameterBuilder { fun build(): FirJavaValueParameter { return FirJavaValueParameter( source, - session, + declarationSiteSession, resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES, attributes, returnTypeRef, @@ -182,7 +182,7 @@ inline fun buildJavaValueParameterCopy(original: FirValueParameter, init: FirJav } val copyBuilder = FirJavaValueParameterBuilder() copyBuilder.source = original.source - copyBuilder.session = original.declarationSiteSession + copyBuilder.declarationSiteSession = original.declarationSiteSession copyBuilder.attributes = original.attributes.copy() copyBuilder.returnTypeRef = original.returnTypeRef copyBuilder.name = original.name diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/SignatureEnhancement.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/SignatureEnhancement.kt index 0d509a24c89..f335e8e228a 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/SignatureEnhancement.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/SignatureEnhancement.kt @@ -94,7 +94,7 @@ class FirSignatureEnhancement( val symbol = FirFieldSymbol(original.callableId) buildJavaField { source = firElement.source - session = this@FirSignatureEnhancement.session + declarationSiteSession = session this.symbol = symbol this.name = name returnTypeRef = newReturnTypeRef @@ -131,7 +131,7 @@ class FirSignatureEnhancement( setterDelegate?.symbol } return buildSyntheticProperty { - session = this@FirSignatureEnhancement.session + declarationSiteSession = session this.name = name symbol = FirAccessorSymbol(accessorSymbol.callableId, accessorSymbol.accessorId) delegateGetter = enhancedGetterSymbol.fir as FirSimpleFunction @@ -207,7 +207,7 @@ class FirSignatureEnhancement( buildValueParameter { source = valueParameter.source - session = this@FirSignatureEnhancement.session + declarationSiteSession = session origin = FirDeclarationOrigin.Enhancement returnTypeRef = enhancedReturnType this.name = valueParameter.name @@ -255,7 +255,7 @@ class FirSignatureEnhancement( } }.apply { source = firMethod.source - session = this@FirSignatureEnhancement.session + declarationSiteSession = session resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES origin = FirDeclarationOrigin.Enhancement this.valueParameters += newValueParameters @@ -265,7 +265,7 @@ class FirSignatureEnhancement( is FirJavaMethod -> { FirSimpleFunctionBuilder().apply { source = firMethod.source - session = this@FirSignatureEnhancement.session + declarationSiteSession = session origin = FirDeclarationOrigin.Enhancement returnTypeRef = newReturnTypeRef receiverTypeRef = newReceiverTypeRef diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaClassUseSiteMemberScope.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaClassUseSiteMemberScope.kt index 978ff3f8581..201905917df 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaClassUseSiteMemberScope.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaClassUseSiteMemberScope.kt @@ -62,7 +62,7 @@ class JavaClassUseSiteMemberScope( ): FirAccessorSymbol { return accessorByNameMap.getOrPut(property.name) { buildSyntheticProperty { - session = this@JavaClassUseSiteMemberScope.session + declarationSiteSession = session name = property.name symbol = FirAccessorSymbol( accessorId = getterSymbol.callableId, diff --git a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/ConverterUtil.kt b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/ConverterUtil.kt index 4b95fcb0bf6..0aae7c5eb10 100644 --- a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/ConverterUtil.kt +++ b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/ConverterUtil.kt @@ -120,7 +120,7 @@ fun generateDestructuringBlock( for ((index, entry) in multiDeclaration.entries.withIndex()) { if (entry == null) continue statements += buildProperty { - this.session = session + declarationSiteSession = session origin = FirDeclarationOrigin.Source returnTypeRef = entry.returnTypeRef name = entry.name 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 02093387a55..81e91fb9f87 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 @@ -107,7 +107,7 @@ class DeclarationsConverter( return buildFile { source = file.toFirSourceElement() origin = FirDeclarationOrigin.Source - session = baseSession + declarationSiteSession = baseSession name = fileName packageFqName = context.packageFqName annotations += fileAnnotationList @@ -411,7 +411,7 @@ class DeclarationsConverter( buildRegularClass { source = classNode.toFirSourceElement() - session = baseSession + declarationSiteSession = baseSession origin = FirDeclarationOrigin.Source name = className this.status = status @@ -548,7 +548,7 @@ class DeclarationsConverter( val objectDeclaration = objectLiteral.getChildNodesByType(OBJECT_DECLARATION).first() source = objectDeclaration.toFirSourceElement() origin = FirDeclarationOrigin.Source - session = baseSession + declarationSiteSession = baseSession classKind = ClassKind.OBJECT scopeProvider = baseScopeProvider symbol = FirAnonymousObjectSymbol() @@ -639,7 +639,7 @@ class DeclarationsConverter( val enumEntryName = identifier.nameAsSafeName() return buildEnumEntry { source = enumEntry.toFirSourceElement() - session = baseSession + declarationSiteSession = baseSession origin = FirDeclarationOrigin.Source returnTypeRef = classWrapper.delegatedSelfTypeRef name = enumEntryName @@ -657,7 +657,7 @@ class DeclarationsConverter( initializer = withChildClassName(enumEntryName) { buildAnonymousObject { source = enumEntry.toFirSourceElement(FirFakeSourceElementKind.EnumInitializer) - session = baseSession + declarationSiteSession = baseSession origin = FirDeclarationOrigin.Source classKind = ClassKind.ENUM_ENTRY scopeProvider = baseScopeProvider @@ -795,7 +795,7 @@ class DeclarationsConverter( buildPrimaryConstructor { source = primaryConstructor?.toFirSourceElement() ?: selfTypeSource?.fakeElement(FirFakeSourceElementKind.ImplicitConstructor) - session = baseSession + declarationSiteSession = baseSession origin = FirDeclarationOrigin.Source returnTypeRef = classWrapper.delegatedSelfTypeRef this.status = status @@ -825,7 +825,7 @@ class DeclarationsConverter( return buildAnonymousInitializer { source = anonymousInitializer.toFirSourceElement() - session = baseSession + declarationSiteSession = baseSession origin = FirDeclarationOrigin.Source body = if (stubMode) buildEmptyExpressionBlock() else firBlock ?: buildEmptyExpressionBlock() } @@ -863,7 +863,7 @@ class DeclarationsConverter( val target = FirFunctionTarget(labelName = null, isLambda = false) return buildConstructor { source = secondaryConstructor.toFirSourceElement() - session = baseSession + declarationSiteSession = baseSession origin = FirDeclarationOrigin.Source returnTypeRef = delegatedSelfTypeRef this.status = status @@ -955,7 +955,7 @@ class DeclarationsConverter( return withChildClassName(typeAliasName) { return@withChildClassName buildTypeAlias { source = typeAlias.toFirSourceElement() - session = baseSession + declarationSiteSession = baseSession origin = FirDeclarationOrigin.Source name = typeAliasName status = FirDeclarationStatusImpl(modifiers.getVisibility(), Modality.FINAL).apply { @@ -1013,7 +1013,7 @@ class DeclarationsConverter( return buildProperty { source = propertySource - session = baseSession + declarationSiteSession = baseSession origin = FirDeclarationOrigin.Source returnTypeRef = returnType name = propertyName @@ -1077,7 +1077,7 @@ class DeclarationsConverter( val convertedAccessors = accessors.map { convertGetterOrSetter(it, returnType, propertyVisibility, modifiers) } this.getter = convertedAccessors.find { it.isGetter } ?: FirDefaultPropertyGetter( - null, session, FirDeclarationOrigin.Source, returnType, propertyVisibility + null, declarationSiteSession, FirDeclarationOrigin.Source, returnType, propertyVisibility ).also { it.status = defaultAccessorStatus() it.initContainingClassAttr() @@ -1086,7 +1086,7 @@ class DeclarationsConverter( this.setter = convertedAccessors.find { it.isSetter } ?: if (isVar) { FirDefaultPropertySetter( - null, session, FirDeclarationOrigin.Source, returnType, propertyVisibility + null, declarationSiteSession, FirDeclarationOrigin.Source, returnType, propertyVisibility ).also { it.status = defaultAccessorStatus() it.initContainingClassAttr() @@ -1165,7 +1165,7 @@ class DeclarationsConverter( val name = identifier.nameAsSafeName() return buildProperty { source = entry.toFirSourceElement() - session = baseSession + declarationSiteSession = baseSession origin = FirDeclarationOrigin.Source returnTypeRef = firType ?: implicitType this.name = name @@ -1190,7 +1190,7 @@ class DeclarationsConverter( var isGetter = true var returnType: FirTypeRef? = null var firValueParameters: FirValueParameter = buildDefaultSetterValueParameter { - session = baseSession + declarationSiteSession = baseSession origin = FirDeclarationOrigin.Source returnTypeRef = propertyTypeRef symbol = FirVariableSymbol(NAME_FOR_DEFAULT_VALUE_PARAMETER) @@ -1241,7 +1241,7 @@ class DeclarationsConverter( val target = FirFunctionTarget(labelName = null, isLambda = false) return buildPropertyAccessor { source = sourceElement - session = baseSession + declarationSiteSession = baseSession origin = FirDeclarationOrigin.Source returnTypeRef = returnType ?: if (isGetter) propertyTypeRef else implicitUnitType symbol = FirPropertyAccessorSymbol() @@ -1311,7 +1311,7 @@ class DeclarationsConverter( return buildValueParameter { source = setterParameter.toFirSourceElement() - session = baseSession + declarationSiteSession = baseSession origin = FirDeclarationOrigin.Source returnTypeRef = if (firValueParameter.returnTypeRef == implicitType) propertyTypeRef else firValueParameter.returnTypeRef name = firValueParameter.name @@ -1405,7 +1405,7 @@ class DeclarationsConverter( } return functionBuilder.apply { - session = baseSession + declarationSiteSession = baseSession origin = FirDeclarationOrigin.Source returnTypeRef = returnType!! @@ -1573,7 +1573,7 @@ class DeclarationsConverter( delegateFields.add( buildField { source = firExpression!!.source - session = baseSession + declarationSiteSession = baseSession origin = FirDeclarationOrigin.Synthetic name = delegateName returnTypeRef = firTypeRef @@ -1649,7 +1649,7 @@ class DeclarationsConverter( return buildTypeParameter { source = typeParameter.toFirSourceElement() - session = baseSession + declarationSiteSession = baseSession origin = FirDeclarationOrigin.Source name = identifier.nameAsSafeName() symbol = FirTypeParameterSymbol() @@ -1889,7 +1889,7 @@ class DeclarationsConverter( val name = identifier.nameAsSafeName() val firValueParameter = buildValueParameter { source = valueParameter.toFirSourceElement() - session = baseSession + declarationSiteSession = baseSession origin = FirDeclarationOrigin.Source returnTypeRef = firType ?: implicitType this.name = name 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 5e1485a1ef0..0ead6a01fcd 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 @@ -135,7 +135,7 @@ class ExpressionsConverter( val target: FirFunctionTarget return buildAnonymousFunction { source = expressionSource - session = baseSession + declarationSiteSession = baseSession origin = FirDeclarationOrigin.Source returnTypeRef = implicitType receiverTypeRef = implicitType @@ -153,7 +153,7 @@ class ExpressionsConverter( val name = DESTRUCTURING_NAME val multiParameter = buildValueParameter { source = valueParameter.firValueParameter.source - session = baseSession + declarationSiteSession = baseSession origin = FirDeclarationOrigin.Source returnTypeRef = valueParameter.firValueParameter.returnTypeRef this.name = name @@ -642,7 +642,7 @@ class ExpressionsConverter( buildProperty { source = it.toFirSourceElement() origin = FirDeclarationOrigin.Source - session = baseSession + declarationSiteSession = baseSession returnTypeRef = variable.returnTypeRef name = variable.name initializer = variable.initializer 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 4cfb58104ec..32e42a8d68f 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 @@ -51,7 +51,7 @@ class ValueParameter( source = parameterNode?.toFirLightSourceElement( parameterSource.treeStructure, FirFakeSourceElementKind.PropertyFromParameter ) - this.session = session + declarationSiteSession = session origin = FirDeclarationOrigin.Source returnTypeRef = type.copyWithNewSourceKind(FirFakeSourceElementKind.PropertyFromParameter) this.name = name diff --git a/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/PsiConversionUtils.kt b/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/PsiConversionUtils.kt index 02f543794d3..fc7788e77fe 100644 --- a/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/PsiConversionUtils.kt +++ b/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/PsiConversionUtils.kt @@ -101,7 +101,7 @@ internal fun generateDestructuringBlock( val name = entry.nameAsSafeName statements += buildProperty { source = entrySource - this.session = session + declarationSiteSession = session origin = FirDeclarationOrigin.Source returnTypeRef = entry.typeReference.toFirOrImplicitTypeRef() this.name = name 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 0e34ba955fb..4a1e11e93c2 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 @@ -329,7 +329,7 @@ open class RawFirBuilder( val accessorTarget = FirFunctionTarget(labelName = null, isLambda = false) buildPropertyAccessor { this.source = source - session = baseSession + declarationSiteSession = baseSession origin = FirDeclarationOrigin.Source returnTypeRef = if (isGetter) { returnTypeReference?.convertSafe() ?: propertyTypeRef @@ -344,7 +344,7 @@ open class RawFirBuilder( if (!isGetter && valueParameters.isEmpty()) { valueParameters += buildDefaultSetterValueParameter { this.source = source.fakeElement(FirFakeSourceElementKind.DefaultAccessor) - session = baseSession + declarationSiteSession = baseSession origin = FirDeclarationOrigin.Source returnTypeRef = propertyTypeRef symbol = FirVariableSymbol(NAME_FOR_DEFAULT_VALUE_PARAMETER) @@ -396,7 +396,7 @@ open class RawFirBuilder( val name = nameAsSafeName return buildValueParameter { source = toFirSourceElement() - session = baseSession + declarationSiteSession = baseSession origin = FirDeclarationOrigin.Source returnTypeRef = when { typeReference != null -> typeReference.toFirOrErrorType() @@ -429,7 +429,7 @@ open class RawFirBuilder( val propertyName = nameAsSafeName return buildProperty { source = propertySource - session = baseSession + declarationSiteSession = baseSession origin = FirDeclarationOrigin.Source returnTypeRef = type.copyWithNewSourceKind(FirFakeSourceElementKind.PropertyFromParameter) receiverTypeRef = null @@ -568,7 +568,7 @@ open class RawFirBuilder( val delegateSource = superTypeListEntry.delegateExpression?.toFirSourceElement() val delegateField = buildField { source = delegateSource - session = baseSession + declarationSiteSession = baseSession origin = FirDeclarationOrigin.Synthetic name = delegateName returnTypeRef = type @@ -678,7 +678,7 @@ open class RawFirBuilder( } return buildPrimaryConstructor { source = constructorSource - session = baseSession + declarationSiteSession = baseSession origin = FirDeclarationOrigin.Source returnTypeRef = delegatedSelfTypeRef this.status = status @@ -697,7 +697,7 @@ open class RawFirBuilder( context.packageFqName = file.packageFqName return buildFile { source = file.toFirSourceElement() - session = baseSession + declarationSiteSession = baseSession origin = FirDeclarationOrigin.Source name = file.name packageFqName = context.packageFqName @@ -725,7 +725,7 @@ open class RawFirBuilder( val ktEnumEntry = this@toFirEnumEntry return buildEnumEntry { source = toFirSourceElement() - session = baseSession + declarationSiteSession = baseSession origin = FirDeclarationOrigin.Source returnTypeRef = delegatedEnumSelfTypeRef name = nameAsSafeName @@ -743,7 +743,7 @@ open class RawFirBuilder( initializer = withChildClassName(nameAsSafeName) { buildAnonymousObject { source = toFirSourceElement(FirFakeSourceElementKind.EnumInitializer) - session = baseSession + declarationSiteSession = baseSession origin = FirDeclarationOrigin.Source classKind = ClassKind.ENUM_ENTRY scopeProvider = this@RawFirBuilder.baseScopeProvider @@ -828,7 +828,7 @@ open class RawFirBuilder( buildRegularClass { source = classOrObject.toFirSourceElement() - session = baseSession + declarationSiteSession = baseSession origin = FirDeclarationOrigin.Source name = classOrObject.nameAsSafeName this.status = status @@ -923,7 +923,7 @@ open class RawFirBuilder( return withChildClassName(ANONYMOUS_OBJECT_NAME) { buildAnonymousObject { source = objectDeclaration.toFirSourceElement() - session = baseSession + declarationSiteSession = baseSession origin = FirDeclarationOrigin.Source classKind = ClassKind.OBJECT scopeProvider = baseScopeProvider @@ -959,7 +959,7 @@ open class RawFirBuilder( return withChildClassName(typeAlias.nameAsSafeName) { buildTypeAlias { source = typeAlias.toFirSourceElement() - session = baseSession + declarationSiteSession = baseSession origin = FirDeclarationOrigin.Source name = typeAlias.nameAsSafeName status = FirDeclarationStatusImpl(typeAlias.visibility, Modality.FINAL).apply { @@ -1019,7 +1019,7 @@ open class RawFirBuilder( val target = FirFunctionTarget(labelName, isLambda = false) return functionBuilder.apply { source = function.toFirSourceElement() - session = baseSession + declarationSiteSession = baseSession origin = FirDeclarationOrigin.Source returnTypeRef = returnType @@ -1082,7 +1082,7 @@ open class RawFirBuilder( val target: FirFunctionTarget return buildAnonymousFunction { source = literalSource - session = baseSession + declarationSiteSession = baseSession origin = FirDeclarationOrigin.Source returnTypeRef = returnType receiverTypeRef = receiverType @@ -1096,7 +1096,7 @@ open class RawFirBuilder( val name = DESTRUCTURING_NAME val multiParameter = buildValueParameter { source = valueParameter.toFirSourceElement() - session = baseSession + declarationSiteSession = baseSession origin = FirDeclarationOrigin.Source returnTypeRef = valueParameter.typeReference?.convertSafe() ?: buildImplicitTypeRef { source = multiDeclaration.toFirSourceElement(FirFakeSourceElementKind.ImplicitTypeRef) @@ -1167,7 +1167,7 @@ open class RawFirBuilder( val target = FirFunctionTarget(labelName = null, isLambda = false) return buildConstructor { source = this@toFirConstructor.toFirSourceElement() - session = baseSession + declarationSiteSession = baseSession origin = FirDeclarationOrigin.Source returnTypeRef = delegatedSelfTypeRef val explicitVisibility = visibility @@ -1254,7 +1254,7 @@ open class RawFirBuilder( return buildProperty { source = propertySource - session = baseSession + declarationSiteSession = baseSession origin = FirDeclarationOrigin.Source returnTypeRef = propertyType name = propertyName @@ -1339,7 +1339,7 @@ open class RawFirBuilder( override fun visitAnonymousInitializer(initializer: KtAnonymousInitializer, data: Unit): FirElement { return buildAnonymousInitializer { source = initializer.toFirSourceElement() - session = baseSession + declarationSiteSession = baseSession origin = FirDeclarationOrigin.Source body = if (stubMode) buildEmptyExpressionBlock() else initializer.body.toFirBlock() } @@ -1446,7 +1446,7 @@ open class RawFirBuilder( val parameterName = parameter.nameAsSafeName return buildTypeParameter { source = parameter.toFirSourceElement() - session = baseSession + declarationSiteSession = baseSession origin = FirDeclarationOrigin.Source name = parameterName symbol = FirTypeParameterSymbol() @@ -1602,7 +1602,7 @@ open class RawFirBuilder( val name = ktSubjectExpression.nameAsSafeName buildProperty { source = ktSubjectExpression.toFirSourceElement() - session = baseSession + declarationSiteSession = baseSession origin = FirDeclarationOrigin.Source returnTypeRef = ktSubjectExpression.typeReference.toFirOrImplicitType() receiverTypeRef = null 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 3062e92ea89..f718aa72155 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 @@ -157,7 +157,7 @@ abstract class BaseFirBuilder(val baseSession: FirSession, val context: Conte bind( buildErrorFunction { source = baseSource - session = this@BaseFirBuilder.baseSession + declarationSiteSession = baseSession origin = FirDeclarationOrigin.Source diagnostic = ConeSimpleDiagnostic(message, kind) symbol = FirErrorFunctionSymbol() @@ -1116,7 +1116,7 @@ abstract class BaseFirBuilder(val baseSession: FirSession, val context: Conte val parameterSource = sourceNode?.toFirSourceElement() val componentFunction = buildSimpleFunction { source = parameterSource?.fakeElement(FirFakeSourceElementKind.DataClassGeneratedMembers) - session = this@DataClassMembersGenerator.session + declarationSiteSession = session origin = FirDeclarationOrigin.Source returnTypeRef = firProperty.returnTypeRef receiverTypeRef = null @@ -1139,7 +1139,7 @@ abstract class BaseFirBuilder(val baseSession: FirSession, val context: Conte buildSimpleFunction { val classTypeRef = createClassTypeRefWithSourceKind(FirFakeSourceElementKind.DataClassGeneratedMembers) source = this@DataClassMembersGenerator.source.toFirSourceElement(FirFakeSourceElementKind.DataClassGeneratedMembers) - session = this@DataClassMembersGenerator.session + declarationSiteSession = session origin = FirDeclarationOrigin.Source returnTypeRef = classTypeRef name = copyName @@ -1153,7 +1153,7 @@ abstract class BaseFirBuilder(val baseSession: FirSession, val context: Conte createParameterTypeRefWithSourceKind(firProperty, FirFakeSourceElementKind.DataClassGeneratedMembers) valueParameters += buildValueParameter { source = parameterSource - session = this@DataClassMembersGenerator.session + declarationSiteSession = session origin = FirDeclarationOrigin.Source returnTypeRef = propertyReturnTypeRef name = propertyName 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 4d59757bac9..80aacd0c197 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 @@ -278,7 +278,7 @@ fun generateTemporaryVariable( ): FirVariable<*> = buildProperty { this.source = source - this.session = session + declarationSiteSession = session origin = FirDeclarationOrigin.Source returnTypeRef = typeRef ?: buildImplicitTypeRef { this.source = source @@ -402,7 +402,7 @@ fun FirPropertyBuilder.generateAccessorsByDelegate( val returnTarget = FirFunctionTarget(null, isLambda = false) getter = buildPropertyAccessor { this.source = fakeSource - this.session = session + declarationSiteSession = session origin = FirDeclarationOrigin.Source returnTypeRef = buildImplicitTypeRef() isGetter = true @@ -434,14 +434,14 @@ fun FirPropertyBuilder.generateAccessorsByDelegate( val annotations = setter?.annotations setter = buildPropertyAccessor { this.source = fakeSource - this.session = session + declarationSiteSession = session origin = FirDeclarationOrigin.Source returnTypeRef = session.builtinTypes.unitType isGetter = false status = FirDeclarationStatusImpl(Visibilities.Unknown, Modality.FINAL) val parameter = buildValueParameter { source = fakeSource - this.session = session + declarationSiteSession = session origin = FirDeclarationOrigin.Source returnTypeRef = buildImplicitTypeRef() name = DELEGATED_SETTER_PARAM diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/CopyUtils.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/CopyUtils.kt index 406d332ab70..c7cd0df6186 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/CopyUtils.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/CopyUtils.kt @@ -74,7 +74,7 @@ fun FirAnonymousFunction.copy( ): FirAnonymousFunction { return buildAnonymousFunction { this.source = source - this.session = session + declarationSiteSession = session this.origin = origin this.returnTypeRef = returnTypeRef this.receiverTypeRef = receiverTypeRef @@ -116,7 +116,7 @@ fun FirTypeParameter.copy( ): FirTypeParameter { return buildTypeParameter { source = this@copy.source - session = this@copy.declarationSiteSession + declarationSiteSession = this@copy.declarationSiteSession name = this@copy.name symbol = this@copy.symbol variance = this@copy.variance diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/SamResolution.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/SamResolution.kt index cbded62df4b..564d284b752 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/SamResolution.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/SamResolution.kt @@ -130,7 +130,7 @@ class FirSamResolverImpl( val declaredTypeParameter = typeParameter.symbol.fir // TODO: or really declared? FirTypeParameterBuilder().apply { source = declaredTypeParameter.source - session = firSession + declarationSiteSession = firSession origin = FirDeclarationOrigin.SamConstructor name = declaredTypeParameter.name this.symbol = FirTypeParameterSymbol() @@ -161,7 +161,7 @@ class FirSamResolverImpl( } return buildSimpleFunction { - session = firSession + declarationSiteSession = firSession source = firRegularClass.source name = classId.shortClassName origin = FirDeclarationOrigin.SamConstructor @@ -191,7 +191,7 @@ class FirSamResolverImpl( } valueParameters += buildValueParameter { - session = firSession + declarationSiteSession = firSession origin = FirDeclarationOrigin.SamConstructor returnTypeRef = buildResolvedTypeRef { source = firRegularClass.source diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CandidateFactory.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CandidateFactory.kt index 0b55ef668ab..89874f16906 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CandidateFactory.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CandidateFactory.kt @@ -82,7 +82,7 @@ class CandidateFactory private constructor( private fun createErrorFunctionSymbol(diagnostic: ConeDiagnostic): FirErrorFunctionSymbol { return FirErrorFunctionSymbol().also { buildErrorFunction { - session = context.session + declarationSiteSession = context.session resolvePhase = FirResolvePhase.BODY_RESOLVE origin = FirDeclarationOrigin.Synthetic this.diagnostic = diagnostic @@ -94,7 +94,7 @@ class CandidateFactory private constructor( private fun createErrorPropertySymbol(diagnostic: ConeDiagnostic): FirErrorPropertySymbol { return FirErrorPropertySymbol(diagnostic).also { buildErrorProperty { - session = context.session + declarationSiteSession = context.session resolvePhase = FirResolvePhase.BODY_RESOLVE origin = FirDeclarationOrigin.Synthetic name = FirErrorPropertySymbol.NAME diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/Synthetics.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/Synthetics.kt index e821001abc8..d2b19dba908 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/Synthetics.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/Synthetics.kt @@ -107,7 +107,7 @@ class FirSyntheticPropertiesScope( val className = classLookupTag?.classId?.relativeClassName val property = buildSyntheticProperty { - session = this@FirSyntheticPropertiesScope.session + declarationSiteSession = session name = propertyName symbol = FirSyntheticPropertySymbol( accessorId = getterSymbol.callableId, diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirCallCompleter.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirCallCompleter.kt index 4eb72d29d6b..5db7b7f95a1 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirCallCompleter.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirCallCompleter.kt @@ -186,7 +186,7 @@ class FirCallCompleter( val itType = parameters.single() buildValueParameter { source = lambdaAtom.atom.source?.fakeElement(FirFakeSourceElementKind.ItLambdaParameter) - session = this@FirCallCompleter.session + declarationSiteSession = session origin = FirDeclarationOrigin.Source returnTypeRef = buildResolvedTypeRef { type = itType.approximateLambdaInputType() } this.name = name diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirCloneableSymbolProvider.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirCloneableSymbolProvider.kt index 54ed05e54e4..ad19dc2f4ed 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirCloneableSymbolProvider.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirCloneableSymbolProvider.kt @@ -39,7 +39,7 @@ class FirCloneableSymbolProvider(session: FirSession, scopeProvider: FirScopePro private val klass = buildRegularClass { resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES origin = FirDeclarationOrigin.Library - this.session = session + declarationSiteSession = session status = FirDeclarationStatusImpl( Visibilities.Public, Modality.ABSTRACT @@ -47,7 +47,7 @@ class FirCloneableSymbolProvider(session: FirSession, scopeProvider: FirScopePro classKind = ClassKind.INTERFACE symbol = FirRegularClassSymbol(CLONEABLE_CLASS_ID) declarations += buildSimpleFunction { - this.session = session + declarationSiteSession = session resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES origin = FirDeclarationOrigin.Library returnTypeRef = buildResolvedTypeRef { diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSyntheticCallGenerator.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSyntheticCallGenerator.kt index 7a172cde93f..5f798c9429e 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSyntheticCallGenerator.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSyntheticCallGenerator.kt @@ -70,7 +70,7 @@ class FirSyntheticCallGenerator( return whenExpression.transformCalleeReference(UpdateReference, reference) } - fun generateCalleeForTryExpression(tryExpression: FirTryExpression, context: ResolutionContext): FirTryExpression? { + fun generateCalleeForTryExpression(tryExpression: FirTryExpression, context: ResolutionContext): FirTryExpression { val stubReference = tryExpression.calleeReference assert(stubReference is FirStubReference) @@ -220,7 +220,7 @@ class FirSyntheticCallGenerator( val typeParameterSymbol = FirTypeParameterSymbol() val typeParameter = buildTypeParameter { - session = this@FirSyntheticCallGenerator.session + declarationSiteSession = session origin = FirDeclarationOrigin.Library name = Name.identifier("K") symbol = typeParameterSymbol @@ -321,7 +321,7 @@ class FirSyntheticCallGenerator( symbol: FirNamedFunctionSymbol, name: Name, returnType: FirTypeRef ): FirSimpleFunctionBuilder { return FirSimpleFunctionBuilder().apply { - session = this@FirSyntheticCallGenerator.session + declarationSiteSession = session origin = FirDeclarationOrigin.Synthetic this.symbol = symbol this.name = name @@ -346,7 +346,7 @@ class FirSyntheticCallGenerator( ): FirValueParameter { val name = Name.identifier(nameAsString) return buildValueParameter { - session = this@FirSyntheticCallGenerator.session + declarationSiteSession = session origin = FirDeclarationOrigin.Library this.name = name returnTypeRef = this@toValueParameter diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirDeclarationsResolveTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirDeclarationsResolveTransformer.kt index 69873f3bcce..4f6b0567aca 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirDeclarationsResolveTransformer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirDeclarationsResolveTransformer.kt @@ -654,7 +654,7 @@ open class FirDeclarationsResolveTransformer(transformer: FirBodyResolveTransfor val name = Name.identifier("it") val itParam = buildValueParameter { source = lambda.source?.fakeElement(FirFakeSourceElementKind.ItLambdaParameter) - session = this@FirDeclarationsResolveTransformer.session + declarationSiteSession = session origin = FirDeclarationOrigin.Source returnTypeRef = buildResolvedTypeRef { type = singleParameterType } this.name = name diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/contracts/FirContractResolveTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/contracts/FirContractResolveTransformer.kt index 5a212b78095..f31622dc2b7 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/contracts/FirContractResolveTransformer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/contracts/FirContractResolveTransformer.kt @@ -165,7 +165,7 @@ open class FirContractResolveTransformer( contractDescription: FirRawContractDescription ): T { val effectsBlock = buildAnonymousFunction { - session = this@FirDeclarationsContractResolveTransformer.session + declarationSiteSession = session origin = FirDeclarationOrigin.Source returnTypeRef = buildImplicitTypeRef() receiverTypeRef = buildImplicitTypeRef() diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirFakeOverrideGenerator.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirFakeOverrideGenerator.kt index 873e896efe8..3afdd764964 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirFakeOverrideGenerator.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirFakeOverrideGenerator.kt @@ -101,7 +101,7 @@ object FirFakeOverrideGenerator { ): FirSimpleFunction { return buildSimpleFunction { source = baseFunction.source - this.session = session + declarationSiteSession = session this.origin = origin name = baseFunction.name status = baseFunction.status.copy(isExpect, newModality, newVisibility) @@ -130,7 +130,7 @@ object FirFakeOverrideGenerator { // TODO: consider using here some light-weight functions instead of pseudo-real FirMemberFunctionImpl // As second alternative, we can invent some light-weight kind of FirRegularClass return buildConstructor { - this.session = session + declarationSiteSession = session origin = FirDeclarationOrigin.SubstitutionOverride receiverTypeRef = baseConstructor.receiverTypeRef?.withReplacedConeType(null) status = baseConstructor.status.copy(isExpect) @@ -282,7 +282,7 @@ object FirFakeOverrideGenerator { ): FirProperty { return buildProperty { source = baseProperty.source - this.session = session + declarationSiteSession = session this.origin = origin name = baseProperty.name isVar = baseProperty.isVar @@ -389,7 +389,7 @@ object FirFakeOverrideGenerator { CallableId(derivedClassId ?: baseSymbol.callableId.classId!!, baseField.name) ) buildField { - this.session = session + declarationSiteSession = session this.symbol = symbol origin = FirDeclarationOrigin.SubstitutionOverride returnTypeRef = baseField.returnTypeRef.withReplacedConeType(newReturnType) @@ -445,7 +445,7 @@ object FirFakeOverrideGenerator { fakeOverrideSubstitution = fakeOverrideSubstitution ) return buildSyntheticProperty { - this.session = session + declarationSiteSession = session name = baseProperty.name symbol = FirAccessorSymbol(baseSymbol.callableId, baseSymbol.accessorId) delegateGetter = getter @@ -465,7 +465,7 @@ object FirFakeOverrideGenerator { if (typeParameter !is FirTypeParameter) return@map null FirTypeParameterBuilder().apply { source = typeParameter.source - session = typeParameter.declarationSiteSession + declarationSiteSession = typeParameter.declarationSiteSession origin = FirDeclarationOrigin.SubstitutionOverride name = typeParameter.name symbol = FirTypeParameterSymbol() diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAbstractConstructorBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAbstractConstructorBuilder.kt index 65fdb8553d1..2d8512686cb 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAbstractConstructorBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAbstractConstructorBuilder.kt @@ -34,7 +34,7 @@ import org.jetbrains.kotlin.serialization.deserialization.descriptors.Deserializ @FirBuilderDsl interface FirAbstractConstructorBuilder : FirFunctionBuilder { abstract override var source: FirSourceElement? - abstract override var session: FirSession + abstract override var declarationSiteSession: FirSession abstract override var resolvePhase: FirResolvePhase abstract override var origin: FirDeclarationOrigin abstract override var attributes: FirDeclarationAttributes 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 be03fea0426..b47239c8ca9 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 @@ -38,7 +38,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirAnonymousFunctionBuilder : FirFunctionBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { override var source: FirSourceElement? = null - override lateinit var session: FirSession + override lateinit var declarationSiteSession: FirSession override lateinit var origin: FirDeclarationOrigin override var attributes: FirDeclarationAttributes = FirDeclarationAttributes() override val annotations: MutableList = mutableListOf() @@ -58,7 +58,7 @@ class FirAnonymousFunctionBuilder : FirFunctionBuilder, FirAnnotationContainerBu override fun build(): FirAnonymousFunction { return FirAnonymousFunctionImpl( source, - session, + declarationSiteSession, origin, attributes, annotations, 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 05363147bb4..cf7f2d7a4b3 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 @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirAnonymousInitializerBuilder : FirDeclarationBuilder { override var source: FirSourceElement? = null - override lateinit var session: FirSession + override lateinit var declarationSiteSession: FirSession override var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR override lateinit var origin: FirDeclarationOrigin override var attributes: FirDeclarationAttributes = FirDeclarationAttributes() @@ -38,7 +38,7 @@ class FirAnonymousInitializerBuilder : FirDeclarationBuilder { override fun build(): FirAnonymousInitializer { return FirAnonymousInitializerImpl( source, - session, + declarationSiteSession, resolvePhase, origin, attributes, 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 0a575f9b53d..3d93c206b30 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 @@ -37,7 +37,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirAnonymousObjectBuilder : FirDeclarationBuilder, FirClassBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { override var source: FirSourceElement? = null - override lateinit var session: FirSession + override lateinit var declarationSiteSession: FirSession override var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR override lateinit var origin: FirDeclarationOrigin override var attributes: FirDeclarationAttributes = FirDeclarationAttributes() @@ -53,7 +53,7 @@ class FirAnonymousObjectBuilder : FirDeclarationBuilder, FirClassBuilder, FirAnn override fun build(): FirAnonymousObject { return FirAnonymousObjectImpl( source, - session, + declarationSiteSession, resolvePhase, origin, attributes, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirClassBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirClassBuilder.kt index 64a87edcbcf..efad49e4099 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirClassBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirClassBuilder.kt @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl interface FirClassBuilder : FirDeclarationBuilder, FirAnnotationContainerBuilder { abstract override var source: FirSourceElement? - abstract override var session: FirSession + abstract override var declarationSiteSession: FirSession abstract override var resolvePhase: FirResolvePhase abstract override var origin: FirDeclarationOrigin abstract override var attributes: FirDeclarationAttributes 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 5e77add7db9..d0216068262 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 @@ -37,7 +37,7 @@ import org.jetbrains.kotlin.serialization.deserialization.descriptors.Deserializ @FirBuilderDsl open class FirConstructorBuilder : FirAbstractConstructorBuilder, FirAnnotationContainerBuilder { override var source: FirSourceElement? = null - override lateinit var session: FirSession + override lateinit var declarationSiteSession: FirSession override var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR override lateinit var origin: FirDeclarationOrigin override var attributes: FirDeclarationAttributes = FirDeclarationAttributes() @@ -56,7 +56,7 @@ open class FirConstructorBuilder : FirAbstractConstructorBuilder, FirAnnotationC override fun build(): FirConstructor { return FirConstructorImpl( source, - session, + declarationSiteSession, resolvePhase, origin, attributes, @@ -98,7 +98,7 @@ inline fun buildConstructorCopy(original: FirConstructor, init: FirConstructorBu } val copyBuilder = FirConstructorBuilder() copyBuilder.source = original.source - copyBuilder.session = original.declarationSideSession + copyBuilder.declarationSiteSession = original.declarationSiteSession copyBuilder.resolvePhase = original.resolvePhase copyBuilder.origin = original.origin copyBuilder.attributes = original.attributes.copy() diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirDeclarationBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirDeclarationBuilder.kt index 8257e233438..c131f054984 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirDeclarationBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirDeclarationBuilder.kt @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl interface FirDeclarationBuilder { abstract var source: FirSourceElement? - abstract var session: FirSession + abstract var declarationSiteSession: FirSession abstract var resolvePhase: FirResolvePhase abstract var origin: FirDeclarationOrigin abstract var attributes: FirDeclarationAttributes 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 fe1bfb5f228..6f76eeceb42 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 @@ -33,7 +33,7 @@ import org.jetbrains.kotlin.name.Name @FirBuilderDsl class FirDefaultSetterValueParameterBuilder : FirAnnotationContainerBuilder { override var source: FirSourceElement? = null - lateinit var session: FirSession + lateinit var declarationSiteSession: FirSession var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR lateinit var origin: FirDeclarationOrigin var attributes: FirDeclarationAttributes = FirDeclarationAttributes() @@ -56,7 +56,7 @@ class FirDefaultSetterValueParameterBuilder : FirAnnotationContainerBuilder { override fun build(): FirValueParameter { return FirDefaultSetterValueParameter( source, - session, + declarationSiteSession, resolvePhase, origin, attributes, 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 a13981a5c97..a71a124c930 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 @@ -36,7 +36,7 @@ import org.jetbrains.kotlin.serialization.deserialization.descriptors.Deserializ @FirBuilderDsl class FirEnumEntryBuilder : FirAnnotationContainerBuilder { override var source: FirSourceElement? = null - lateinit var session: FirSession + lateinit var declarationSiteSession: FirSession var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR lateinit var origin: FirDeclarationOrigin var attributes: FirDeclarationAttributes = FirDeclarationAttributes() @@ -53,7 +53,7 @@ class FirEnumEntryBuilder : FirAnnotationContainerBuilder { override fun build(): FirEnumEntry { return FirEnumEntryImpl( source, - session, + declarationSiteSession, resolvePhase, origin, attributes, 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 f2350165656..593af9f342b 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 @@ -34,7 +34,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirErrorFunctionBuilder : FirAnnotationContainerBuilder { override var source: FirSourceElement? = null - lateinit var session: FirSession + lateinit var declarationSiteSession: FirSession var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR lateinit var origin: FirDeclarationOrigin var attributes: FirDeclarationAttributes = FirDeclarationAttributes() @@ -47,7 +47,7 @@ class FirErrorFunctionBuilder : FirAnnotationContainerBuilder { override fun build(): FirErrorFunction { return FirErrorFunctionImpl( source, - session, + declarationSiteSession, resolvePhase, 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 f3d98151815..d285193ca02 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 @@ -35,7 +35,7 @@ import org.jetbrains.kotlin.name.Name @FirBuilderDsl class FirErrorPropertyBuilder : FirAnnotationContainerBuilder { override var source: FirSourceElement? = null - lateinit var session: FirSession + lateinit var declarationSiteSession: FirSession var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR lateinit var origin: FirDeclarationOrigin var attributes: FirDeclarationAttributes = FirDeclarationAttributes() @@ -48,7 +48,7 @@ class FirErrorPropertyBuilder : FirAnnotationContainerBuilder { override fun build(): FirErrorProperty { return FirErrorPropertyImpl( source, - session, + declarationSiteSession, resolvePhase, origin, attributes, 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 61611b74225..b6f1be8fd72 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 @@ -38,7 +38,7 @@ import org.jetbrains.kotlin.serialization.deserialization.descriptors.Deserializ @FirBuilderDsl open class FirFieldBuilder : FirDeclarationBuilder, FirAnnotationContainerBuilder { override var source: FirSourceElement? = null - override lateinit var session: FirSession + override lateinit var declarationSiteSession: FirSession override var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR override lateinit var origin: FirDeclarationOrigin override var attributes: FirDeclarationAttributes = FirDeclarationAttributes() @@ -57,7 +57,7 @@ open class FirFieldBuilder : FirDeclarationBuilder, FirAnnotationContainerBuilde override fun build(): FirField { return FirFieldImpl( source, - session, + declarationSiteSession, resolvePhase, origin, attributes, 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 859e46178e4..f5a03218e16 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 @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.name.FqName @FirBuilderDsl class FirFileBuilder : FirAnnotationContainerBuilder { override var source: FirSourceElement? = null - lateinit var session: FirSession + lateinit var declarationSiteSession: FirSession var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR lateinit var origin: FirDeclarationOrigin var attributes: FirDeclarationAttributes = FirDeclarationAttributes() @@ -42,7 +42,7 @@ class FirFileBuilder : FirAnnotationContainerBuilder { override fun build(): FirFile { return FirFileImpl( source, - session, + declarationSiteSession, resolvePhase, origin, attributes, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFunctionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFunctionBuilder.kt index 0fe0d90734c..95d5020d001 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFunctionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFunctionBuilder.kt @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl interface FirFunctionBuilder : FirDeclarationBuilder, FirAnnotationContainerBuilder { abstract override var source: FirSourceElement? - abstract override var session: FirSession + abstract override var declarationSiteSession: FirSession abstract override var resolvePhase: FirResolvePhase abstract override var origin: FirDeclarationOrigin abstract override var attributes: FirDeclarationAttributes 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 6645f7af9c6..9ca869044c6 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 @@ -37,7 +37,7 @@ import org.jetbrains.kotlin.serialization.deserialization.descriptors.Deserializ @FirBuilderDsl class FirPrimaryConstructorBuilder : FirAbstractConstructorBuilder, FirAnnotationContainerBuilder { override var source: FirSourceElement? = null - override lateinit var session: FirSession + override lateinit var declarationSiteSession: FirSession override var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR override lateinit var origin: FirDeclarationOrigin override var attributes: FirDeclarationAttributes = FirDeclarationAttributes() @@ -56,7 +56,7 @@ class FirPrimaryConstructorBuilder : FirAbstractConstructorBuilder, FirAnnotatio override fun build(): FirConstructor { return FirPrimaryConstructor( source, - session, + declarationSiteSession, resolvePhase, origin, attributes, 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 c056f12fadf..e3ecd9a1140 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 @@ -40,7 +40,7 @@ import org.jetbrains.kotlin.serialization.deserialization.descriptors.Deserializ @FirBuilderDsl class FirPropertyAccessorBuilder : FirFunctionBuilder, FirAnnotationContainerBuilder { override var source: FirSourceElement? = null - override lateinit var session: FirSession + override lateinit var declarationSiteSession: FirSession override var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR override lateinit var origin: FirDeclarationOrigin override var attributes: FirDeclarationAttributes = FirDeclarationAttributes() @@ -60,7 +60,7 @@ class FirPropertyAccessorBuilder : FirFunctionBuilder, FirAnnotationContainerBui override fun build(): FirPropertyAccessor { return FirPropertyAccessorImpl( source, - session, + declarationSiteSession, resolvePhase, origin, attributes, @@ -95,7 +95,7 @@ inline fun buildPropertyAccessorCopy(original: FirPropertyAccessor, init: FirPro } val copyBuilder = FirPropertyAccessorBuilder() copyBuilder.source = original.source - copyBuilder.session = original.declarationSideSession + copyBuilder.declarationSiteSession = original.declarationSiteSession copyBuilder.resolvePhase = original.resolvePhase copyBuilder.origin = original.origin copyBuilder.attributes = original.attributes.copy() 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 57f6a0c77cd..0a7d5af0764 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 @@ -40,7 +40,7 @@ import org.jetbrains.kotlin.serialization.deserialization.descriptors.Deserializ @FirBuilderDsl class FirPropertyBuilder : FirDeclarationBuilder, FirTypeParametersOwnerBuilder, FirAnnotationContainerBuilder { override var source: FirSourceElement? = null - override lateinit var session: FirSession + override lateinit var declarationSiteSession: FirSession override var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR override lateinit var origin: FirDeclarationOrigin override var attributes: FirDeclarationAttributes = FirDeclarationAttributes() @@ -64,7 +64,7 @@ class FirPropertyBuilder : FirDeclarationBuilder, FirTypeParametersOwnerBuilder, override fun build(): FirProperty { return FirPropertyImpl( source, - session, + declarationSiteSession, resolvePhase, origin, attributes, @@ -104,7 +104,7 @@ inline fun buildPropertyCopy(original: FirProperty, init: FirPropertyBuilder.() } val copyBuilder = FirPropertyBuilder() copyBuilder.source = original.source - copyBuilder.session = original.declarationSideSession + copyBuilder.declarationSiteSession = original.declarationSiteSession copyBuilder.resolvePhase = original.resolvePhase copyBuilder.origin = original.origin copyBuilder.attributes = original.attributes.copy() 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 4f1849280e2..ea6c788d3a5 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 @@ -37,7 +37,7 @@ import org.jetbrains.kotlin.name.Name @FirBuilderDsl open class FirRegularClassBuilder : FirClassBuilder, FirTypeParameterRefsOwnerBuilder, FirAnnotationContainerBuilder { override var source: FirSourceElement? = null - override lateinit var session: FirSession + override lateinit var declarationSiteSession: FirSession override var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR override lateinit var origin: FirDeclarationOrigin override var attributes: FirDeclarationAttributes = FirDeclarationAttributes() @@ -55,7 +55,7 @@ open class FirRegularClassBuilder : FirClassBuilder, FirTypeParameterRefsOwnerBu override fun build(): FirRegularClass { return FirRegularClassImpl( source, - session, + declarationSiteSession, resolvePhase, origin, attributes, @@ -89,7 +89,7 @@ inline fun buildRegularClassCopy(original: FirRegularClass, init: FirRegularClas } val copyBuilder = FirRegularClassBuilder() copyBuilder.source = original.source - copyBuilder.session = original.session + copyBuilder.declarationSiteSession = original.declarationSiteSession copyBuilder.resolvePhase = original.resolvePhase copyBuilder.origin = original.origin copyBuilder.attributes = original.attributes.copy() 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 4d5e9fad2a5..5ef7e114fb5 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 @@ -40,7 +40,7 @@ import org.jetbrains.kotlin.serialization.deserialization.descriptors.Deserializ @FirBuilderDsl open class FirSimpleFunctionBuilder : FirFunctionBuilder, FirTypeParametersOwnerBuilder, FirAnnotationContainerBuilder { override var source: FirSourceElement? = null - override lateinit var session: FirSession + override lateinit var declarationSiteSession: FirSession override var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR override lateinit var origin: FirDeclarationOrigin override var attributes: FirDeclarationAttributes = FirDeclarationAttributes() @@ -60,7 +60,7 @@ open class FirSimpleFunctionBuilder : FirFunctionBuilder, FirTypeParametersOwner override fun build(): FirSimpleFunction { return FirSimpleFunctionImpl( source, - session, + declarationSiteSession, resolvePhase, origin, attributes, @@ -96,7 +96,7 @@ inline fun buildSimpleFunctionCopy(original: FirSimpleFunction, init: FirSimpleF } val copyBuilder = FirSimpleFunctionBuilder() copyBuilder.source = original.source - copyBuilder.session = original.declarationSideSession + copyBuilder.declarationSiteSession = original.declarationSiteSession copyBuilder.resolvePhase = original.resolvePhase copyBuilder.origin = original.origin copyBuilder.attributes = original.attributes.copy() 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 a28d66233bb..c5277bb4778 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 @@ -33,7 +33,7 @@ import org.jetbrains.kotlin.name.Name @FirBuilderDsl class FirTypeAliasBuilder : FirDeclarationBuilder, FirTypeParametersOwnerBuilder, FirAnnotationContainerBuilder { override var source: FirSourceElement? = null - override lateinit var session: FirSession + override lateinit var declarationSiteSession: FirSession override var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR override lateinit var origin: FirDeclarationOrigin override var attributes: FirDeclarationAttributes = FirDeclarationAttributes() @@ -47,7 +47,7 @@ class FirTypeAliasBuilder : FirDeclarationBuilder, FirTypeParametersOwnerBuilder override fun build(): FirTypeAlias { return FirTypeAliasImpl( source, - session, + declarationSiteSession, resolvePhase, origin, attributes, @@ -77,7 +77,7 @@ inline fun buildTypeAliasCopy(original: FirTypeAlias, init: FirTypeAliasBuilder. } val copyBuilder = FirTypeAliasBuilder() copyBuilder.source = original.source - copyBuilder.session = original.session + copyBuilder.declarationSiteSession = original.declarationSiteSession copyBuilder.resolvePhase = original.resolvePhase copyBuilder.origin = original.origin copyBuilder.attributes = original.attributes.copy() 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 330a5ff75c4..0b4738dff0a 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 @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.types.Variance @FirBuilderDsl class FirTypeParameterBuilder : FirAnnotationContainerBuilder { override var source: FirSourceElement? = null - lateinit var session: FirSession + lateinit var declarationSiteSession: FirSession var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR lateinit var origin: FirDeclarationOrigin var attributes: FirDeclarationAttributes = FirDeclarationAttributes() @@ -44,7 +44,7 @@ class FirTypeParameterBuilder : FirAnnotationContainerBuilder { override fun build(): FirTypeParameter { return FirTypeParameterImpl( source, - session, + declarationSiteSession, resolvePhase, origin, attributes, 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 572b2887172..8f9da31275b 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 @@ -33,7 +33,7 @@ import org.jetbrains.kotlin.name.Name @FirBuilderDsl open class FirValueParameterBuilder : FirAnnotationContainerBuilder { override var source: FirSourceElement? = null - open lateinit var session: FirSession + open lateinit var declarationSiteSession: FirSession open var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR open lateinit var origin: FirDeclarationOrigin open var attributes: FirDeclarationAttributes = FirDeclarationAttributes() @@ -49,7 +49,7 @@ open class FirValueParameterBuilder : FirAnnotationContainerBuilder { override fun build(): FirValueParameter { return FirValueParameterImpl( source, - session, + declarationSiteSession, resolvePhase, origin, attributes, @@ -81,7 +81,7 @@ inline fun buildValueParameterCopy(original: FirValueParameter, init: FirValuePa } val copyBuilder = FirValueParameterBuilder() copyBuilder.source = original.source - copyBuilder.session = original.declarationSideSession + copyBuilder.declarationSiteSession = original.declarationSiteSession copyBuilder.resolvePhase = original.resolvePhase copyBuilder.origin = original.origin copyBuilder.attributes = original.attributes.copy() diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/EnumClassUtils.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/EnumClassUtils.kt index c39eaee24c7..75140699f3c 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/EnumClassUtils.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/EnumClassUtils.kt @@ -36,7 +36,7 @@ fun FirRegularClassBuilder.generateValuesFunction( declarations += buildSimpleFunction { source = sourceElement origin = FirDeclarationOrigin.Source - this.session = session + declarationSiteSession = session returnTypeRef = buildResolvedTypeRef { source = sourceElement type = ConeClassLikeTypeImpl( @@ -67,7 +67,7 @@ fun FirRegularClassBuilder.generateValueOfFunction( declarations += buildSimpleFunction { source = sourceElement origin = FirDeclarationOrigin.Source - this.session = session + declarationSiteSession = session returnTypeRef = buildResolvedTypeRef { source = sourceElement type = ConeClassLikeTypeImpl( @@ -85,7 +85,7 @@ fun FirRegularClassBuilder.generateValueOfFunction( valueParameters += buildValueParameter vp@{ source = sourceElement origin = FirDeclarationOrigin.Source - this@vp.session = session + declarationSiteSession = session returnTypeRef = FirImplicitStringTypeRef(source) name = VALUE this@vp.symbol = FirVariableSymbol(VALUE) diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirDeclarationUtil.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirDeclarationUtil.kt index ae5bf64ba51..4177f928b59 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirDeclarationUtil.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirDeclarationUtil.kt @@ -24,12 +24,12 @@ import org.jetbrains.kotlin.fir.types.coneTypeSafe fun FirTypeParameterBuilder.addDefaultBoundIfNecessary(isFlexible: Boolean = false) { if (bounds.isEmpty()) { val type = if (isFlexible) { - val session = this.session + val session = declarationSiteSession buildResolvedTypeRef { type = ConeFlexibleType(session.builtinTypes.anyType.type, session.builtinTypes.nullableAnyType.type) } } else { - session.builtinTypes.nullableAnyType + declarationSiteSession.builtinTypes.nullableAnyType } bounds += type } 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 28a991177eb..36d87183490 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 @@ -112,7 +112,7 @@ class FirDefaultPropertySetter( valueParameters = mutableListOf( buildDefaultSetterValueParameter builder@{ this@builder.source = source - this@builder.session = session + this@builder.declarationSiteSession = session this@builder.origin = origin this@builder.returnTypeRef = propertyTypeRef this@builder.symbol = FirVariableSymbol(CallableId(FqName.ROOT, Name.special(""))) diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticPropertyBuilder.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticPropertyBuilder.kt index b93d78ee0ba..507c040b1ba 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticPropertyBuilder.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticPropertyBuilder.kt @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.fir.symbols.impl.FirAccessorSymbol import org.jetbrains.kotlin.name.Name class FirSyntheticPropertyBuilder { - lateinit var session: FirSession + lateinit var declarationSiteSession: FirSession lateinit var name: Name lateinit var symbol: FirAccessorSymbol lateinit var delegateGetter: FirSimpleFunction @@ -24,7 +24,7 @@ class FirSyntheticPropertyBuilder { var delegateSetter: FirSimpleFunction? = null fun build(): FirSyntheticProperty = FirSyntheticProperty( - session, name, isVar = delegateSetter != null, symbol = symbol, + declarationSiteSession, name, isVar = delegateSetter != null, symbol = symbol, status = status ?: delegateGetter.status, resolvePhase = delegateGetter.resolvePhase, getter = FirSyntheticPropertyAccessor(delegateGetter, isGetter = true), diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/NodeConfigurator.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/NodeConfigurator.kt index dc23a128050..f859ef8aab3 100644 --- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/NodeConfigurator.kt +++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/NodeConfigurator.kt @@ -75,7 +75,7 @@ object NodeConfigurator : AbstractFieldConfigurator(FirTreeBuild } declaration.configure { - +field("session", firSessionType) + +field("declarationSiteSession", firSessionType) +field("resolvePhase", resolvePhaseType, withReplace = true).apply { isMutable = true } +field("origin", declarationOriginType) +field("attributes", declarationAttributesType) diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/api/DeclarationCopyBuilder.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/api/DeclarationCopyBuilder.kt index f9d2e0da4af..bfbc818e5c9 100644 --- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/api/DeclarationCopyBuilder.kt +++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/api/DeclarationCopyBuilder.kt @@ -131,7 +131,7 @@ object DeclarationCopyBuilder { ) { resolvePhase = minOf(originalDeclaration.resolvePhase, FirResolvePhase.DECLARATIONS) source = builtDeclaration.source - session = state.rootModuleSession + declarationSiteSession = state.rootModuleSession } internal inline fun createCopy( @@ -139,8 +139,8 @@ object DeclarationCopyBuilder { originalFirDeclaration: T, ): T { return RawFirFragmentForLazyBodiesBuilder.build( - session = originalFirDeclaration.session, - baseScopeProvider = originalFirDeclaration.session.firIdeProvider.kotlinScopeProvider, + session = originalFirDeclaration.declarationSiteSession, + baseScopeProvider = originalFirDeclaration.declarationSiteSession.firIdeProvider.kotlinScopeProvider, designation = originalFirDeclaration.collectDesignation().fullDesignation, declaration = fakeKtDeclaration ) as T @@ -156,4 +156,4 @@ object DeclarationCopyBuilder { } }) } -} \ No newline at end of file +} diff --git a/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/generators/AllOpenMemberGenerator.kt b/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/generators/AllOpenMemberGenerator.kt index f3b907b532b..4c6edc387c0 100644 --- a/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/generators/AllOpenMemberGenerator.kt +++ b/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/generators/AllOpenMemberGenerator.kt @@ -40,7 +40,7 @@ class AllOpenMemberGenerator(session: FirSession) : FirDeclarationGenerationExte val owner = owners.last() as? FirRegularClass ?: return emptyList() val propertyName = annotatedDeclaration.name.identifier val function = buildSimpleFunction { - session = this@AllOpenMemberGenerator.session + declarationSiteSession = session resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES origin = FirDeclarationOrigin.Plugin(key) returnTypeRef = annotatedDeclaration.returnTypeRef diff --git a/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/generators/AllOpenNestedClassGenerator.kt b/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/generators/AllOpenNestedClassGenerator.kt index db358cdddbe..0f14fc251b5 100644 --- a/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/generators/AllOpenNestedClassGenerator.kt +++ b/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/generators/AllOpenNestedClassGenerator.kt @@ -37,7 +37,7 @@ class AllOpenNestedClassGenerator(session: FirSession) : FirDeclarationGeneratio ): List> { val owner = annotatedDeclaration as? FirRegularClass ?: return emptyList() val newClass = buildRegularClass { - session = this@AllOpenNestedClassGenerator.session + declarationSiteSession = session resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES origin = FirDeclarationOrigin.Plugin(key) status = FirResolvedDeclarationStatusImpl( @@ -60,7 +60,7 @@ class AllOpenNestedClassGenerator(session: FirSession) : FirDeclarationGeneratio val classId = klass.symbol.classId val constructor = buildConstructor { - session = klass.declarationSiteSession + declarationSiteSession = session resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES origin = FirDeclarationOrigin.Plugin(key) returnTypeRef = buildResolvedTypeRef { @@ -75,7 +75,7 @@ class AllOpenNestedClassGenerator(session: FirSession) : FirDeclarationGeneratio } val function = buildSimpleFunction { - session = klass.declarationSiteSession + declarationSiteSession = session resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES origin = FirDeclarationOrigin.Plugin(key) returnTypeRef = session.builtinTypes.intType diff --git a/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/generators/AllOpenRecursiveNestedClassGenerator.kt b/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/generators/AllOpenRecursiveNestedClassGenerator.kt index 20d09f0c926..fc50cd6a1e8 100644 --- a/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/generators/AllOpenRecursiveNestedClassGenerator.kt +++ b/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/generators/AllOpenRecursiveNestedClassGenerator.kt @@ -35,7 +35,7 @@ class AllOpenRecursiveNestedClassGenerator(session: FirSession) : FirDeclaration if (owners.size > 2) return emptyList() val owner = annotatedDeclaration as? FirRegularClass ?: return emptyList() val newClass = buildRegularClass { - session = this@AllOpenRecursiveNestedClassGenerator.session + declarationSiteSession = session resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES origin = FirDeclarationOrigin.Plugin(key) status = FirResolvedDeclarationStatusImpl( diff --git a/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/generators/AllOpenTopLevelDeclarationsGenerator.kt b/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/generators/AllOpenTopLevelDeclarationsGenerator.kt index 66f2bfd3118..dae16b0ac54 100644 --- a/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/generators/AllOpenTopLevelDeclarationsGenerator.kt +++ b/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/generators/AllOpenTopLevelDeclarationsGenerator.kt @@ -33,7 +33,7 @@ class AllOpenTopLevelDeclarationsGenerator(session: FirSession) : FirDeclaration val file = owners.first() as FirFile val klass = annotatedDeclaration as? FirRegularClass ?: return emptyList() val newClass = buildRegularClass { - session = this@AllOpenTopLevelDeclarationsGenerator.session + declarationSiteSession = session resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES origin = FirDeclarationOrigin.Plugin(key) status = FirResolvedDeclarationStatusImpl( @@ -52,7 +52,7 @@ class AllOpenTopLevelDeclarationsGenerator(session: FirSession) : FirDeclaration override fun generateMembersForGeneratedClass(generatedClass: GeneratedClass): List { val klass = generatedClass.klass val function = buildSimpleFunction { - session = klass.declarationSiteSession + declarationSiteSession = session resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES origin = FirDeclarationOrigin.Plugin(key) returnTypeRef = session.builtinTypes.intType