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

[FIR] Fix sources of intersection override properties's accessors

Browse Source 
^KT-66046
This commit is contained in:
Nikolay Lunyak
2024-03-06 13:02:07 +02:00
committed by Space Team
parent daa6e03e3b
commit b7926b68ab
3 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/impl/FirFakeOverrideGenerator.kt
+10 -4
View File
@@ -400,9 +400,9 @@ object FirFakeOverrideGenerator {
newModality: Modality? = null,
newVisibility: Visibility? = null,
deferredReturnTypeCalculation: DeferredCallableCopyReturnType? = null,
newSource: KtSourceElement? = derivedClassLookupTag?.toSymbol(session)?.source ?: baseProperty.source,
newSource: KtSourceElement? = derivedClassLookupTag?.toSymbol(session)?.source,
): FirProperty = buildProperty {
source = newSource
source = newSource ?: baseProperty.source
moduleData = session.nullableModuleData ?: baseProperty.moduleData
this.origin = origin
name = baseProperty.name
@@ -433,6 +433,7 @@ object FirFakeOverrideGenerator {
dispatchReceiverType = dispatchReceiverType,
derivedClassLookupTag = derivedClassLookupTag,
baseProperty = baseProperty,
newSource = newSource ?: baseProperty.getter?.source,
)
setter = baseProperty.setter?.buildCopyIfNeeded(
@@ -443,6 +444,7 @@ object FirFakeOverrideGenerator {
dispatchReceiverType = dispatchReceiverType,
derivedClassLookupTag = derivedClassLookupTag,
baseProperty = baseProperty,
newSource = newSource ?: baseProperty.setter?.source,
)
}.apply {
containingClassForStaticMemberAttr = derivedClassLookupTag.takeIf { shouldOverrideSetContainingClass(baseProperty) }
@@ -456,6 +458,7 @@ object FirFakeOverrideGenerator {
dispatchReceiverType: ConeSimpleKotlinType?,
derivedClassLookupTag: ConeClassLikeLookupTag?,
baseProperty: FirProperty,
newSource: KtSourceElement? = source,
) = when {
annotations.isNotEmpty() || visibility != baseProperty.visibility -> buildCopy(
moduleData,
@@ -465,6 +468,7 @@ object FirFakeOverrideGenerator {
dispatchReceiverType,
derivedClassLookupTag,
baseProperty,
newSource,
)
else -> null
}
@@ -477,9 +481,10 @@ object FirFakeOverrideGenerator {
dispatchReceiverType: ConeSimpleKotlinType?,
derivedClassLookupTag: ConeClassLikeLookupTag?,
baseProperty: FirProperty,
newSource: KtSourceElement? = source,
) = when (this) {
is FirDefaultPropertyGetter -> FirDefaultPropertyGetter(
source = source,
source = newSource,
moduleData = moduleData,
origin = origin,
propertyTypeRef = propertyReturnTypeRef,
@@ -492,7 +497,7 @@ object FirFakeOverrideGenerator {
replaceAnnotations(this@buildCopy.annotations)
}
is FirDefaultPropertySetter -> FirDefaultPropertySetter(
source = source,
source = newSource,
moduleData = moduleData,
origin = origin,
propertyTypeRef = propertyReturnTypeRef,
@@ -505,6 +510,7 @@ object FirFakeOverrideGenerator {
replaceAnnotations(this@buildCopy.annotations)
}
else -> buildPropertyAccessorCopy(this) {
this.source = newSource
this.symbol = FirPropertyAccessorSymbol()
this.moduleData = moduleData
this.origin = origin