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

[FIR Java] Copy also synthetic setter during enhancement

Browse Source
This commit is contained in:
Mikhail Glukhikh
2020-10-30 18:21:16 +03:00
parent e0abf3a62c
commit 22fb620344
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/SignatureEnhancement.kt
+11 -2
View File
@@ -113,18 +113,27 @@ class FirSignatureEnhancement(
is FirSyntheticProperty -> { is FirSyntheticProperty -> {
val accessorSymbol = firElement.symbol val accessorSymbol = firElement.symbol
val getterDelegate = firElement.getter.delegate val getterDelegate = firElement.getter.delegate
val enhancedFunctionSymbol = if (getterDelegate is FirJavaMethod) { val enhancedGetterSymbol = if (getterDelegate is FirJavaMethod) {
enhanceMethod( enhanceMethod(
getterDelegate, accessorSymbol.accessorId, accessorSymbol.accessorId.callableName getterDelegate, accessorSymbol.accessorId, accessorSymbol.accessorId.callableName
) )
} else { } else {
getterDelegate.symbol getterDelegate.symbol
} }
val setterDelegate = firElement.setter?.delegate
val enhancedSetterSymbol = if (setterDelegate is FirJavaMethod) {
enhanceMethod(
setterDelegate, accessorSymbol.accessorId, accessorSymbol.accessorId.callableName
)
} else {
setterDelegate?.symbol
}
return buildSyntheticProperty { return buildSyntheticProperty {
session = this@FirSignatureEnhancement.session session = this@FirSignatureEnhancement.session
this.name = name this.name = name
symbol = FirAccessorSymbol(accessorSymbol.callableId, accessorSymbol.accessorId) symbol = FirAccessorSymbol(accessorSymbol.callableId, accessorSymbol.accessorId)
delegateGetter = enhancedFunctionSymbol.fir as FirSimpleFunction delegateGetter = enhancedGetterSymbol.fir as FirSimpleFunction
delegateSetter = enhancedSetterSymbol?.fir as FirSimpleFunction?
}.symbol }.symbol
} }
else -> { else -> {