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

[FIR] Rename SyntheticPropertySymbol to FirSyntheticPropertySymbol

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2021-03-19 15:40:53 +03:00
parent 714871e4a5
commit b0969f626e
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt
+3 -3
View File
@@ -22,7 +22,7 @@ import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference
import org.jetbrains.kotlin.fir.references.FirThisReference import org.jetbrains.kotlin.fir.references.FirThisReference
import org.jetbrains.kotlin.fir.references.impl.FirPropertyFromParameterResolvedNamedReference import org.jetbrains.kotlin.fir.references.impl.FirPropertyFromParameterResolvedNamedReference
import org.jetbrains.kotlin.fir.resolve.* import org.jetbrains.kotlin.fir.resolve.*
import org.jetbrains.kotlin.fir.resolve.calls.SyntheticPropertySymbol import org.jetbrains.kotlin.fir.resolve.calls.FirSyntheticPropertySymbol
import org.jetbrains.kotlin.fir.resolve.calls.originalConstructorIfTypeAlias import org.jetbrains.kotlin.fir.resolve.calls.originalConstructorIfTypeAlias
import org.jetbrains.kotlin.fir.resolve.providers.FirProvider import org.jetbrains.kotlin.fir.resolve.providers.FirProvider
import org.jetbrains.kotlin.fir.scopes.* import org.jetbrains.kotlin.fir.scopes.*
@@ -176,7 +176,7 @@ fun FirReference.toSymbolForCall(
private fun FirCallableSymbol<*>.toSymbolForCall(declarationStorage: Fir2IrDeclarationStorage, preferGetter: Boolean): IrSymbol? = private fun FirCallableSymbol<*>.toSymbolForCall(declarationStorage: Fir2IrDeclarationStorage, preferGetter: Boolean): IrSymbol? =
when (this) { when (this) {
is FirFunctionSymbol<*> -> declarationStorage.getIrFunctionSymbol(this) is FirFunctionSymbol<*> -> declarationStorage.getIrFunctionSymbol(this)
is SyntheticPropertySymbol -> { is FirSyntheticPropertySymbol -> {
(fir as? FirSyntheticProperty)?.let { syntheticProperty -> (fir as? FirSyntheticProperty)?.let { syntheticProperty ->
val delegateSymbol = if (preferGetter) { val delegateSymbol = if (preferGetter) {
syntheticProperty.getter.delegate.symbol syntheticProperty.getter.delegate.symbol
@@ -393,7 +393,7 @@ internal fun FirReference.statementOrigin(): IrStatementOrigin? {
return when (this) { return when (this) {
is FirPropertyFromParameterResolvedNamedReference -> IrStatementOrigin.INITIALIZE_PROPERTY_FROM_PARAMETER is FirPropertyFromParameterResolvedNamedReference -> IrStatementOrigin.INITIALIZE_PROPERTY_FROM_PARAMETER
is FirResolvedNamedReference -> when (val symbol = resolvedSymbol) { is FirResolvedNamedReference -> when (val symbol = resolvedSymbol) {
is AccessorSymbol, is SyntheticPropertySymbol -> IrStatementOrigin.GET_PROPERTY is AccessorSymbol, is FirSyntheticPropertySymbol -> IrStatementOrigin.GET_PROPERTY
is FirNamedFunctionSymbol -> when { is FirNamedFunctionSymbol -> when {
symbol.callableId.isInvoke() -> symbol.callableId.isInvoke() ->
IrStatementOrigin.INVOKE IrStatementOrigin.INVOKE
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/Synthetics.kt
+2 -2
View File
@@ -23,7 +23,7 @@ import org.jetbrains.kotlin.fir.unwrapFakeOverrides
import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.types.AbstractTypeChecker import org.jetbrains.kotlin.types.AbstractTypeChecker
class SyntheticPropertySymbol( class FirSyntheticPropertySymbol(
callableId: CallableId, callableId: CallableId,
override val accessorId: CallableId override val accessorId: CallableId
) : FirAccessorSymbol(callableId, accessorId), SyntheticSymbol ) : FirAccessorSymbol(callableId, accessorId), SyntheticSymbol
@@ -109,7 +109,7 @@ class FirSyntheticPropertiesScope(
val property = buildSyntheticProperty { val property = buildSyntheticProperty {
session = this@FirSyntheticPropertiesScope.session session = this@FirSyntheticPropertiesScope.session
name = propertyName name = propertyName
symbol = SyntheticPropertySymbol( symbol = FirSyntheticPropertySymbol(
accessorId = getterSymbol.callableId, accessorId = getterSymbol.callableId,
callableId = CallableId(packageName, className, propertyName) callableId = CallableId(packageName, className, propertyName)
) )
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/references/FirReferenceResolveHelper.kt
+2 -2
View File
@@ -14,7 +14,7 @@ import org.jetbrains.kotlin.fir.declarations.synthetic.FirSyntheticProperty
import org.jetbrains.kotlin.fir.expressions.* import org.jetbrains.kotlin.fir.expressions.*
import org.jetbrains.kotlin.fir.psi import org.jetbrains.kotlin.fir.psi
import org.jetbrains.kotlin.fir.references.* import org.jetbrains.kotlin.fir.references.*
import org.jetbrains.kotlin.fir.resolve.calls.SyntheticPropertySymbol import org.jetbrains.kotlin.fir.resolve.calls.FirSyntheticPropertySymbol
import org.jetbrains.kotlin.fir.resolve.diagnostics.ConeAmbiguityError import org.jetbrains.kotlin.fir.resolve.diagnostics.ConeAmbiguityError
import org.jetbrains.kotlin.fir.resolve.diagnostics.ConeInapplicableCandidateError import org.jetbrains.kotlin.fir.resolve.diagnostics.ConeInapplicableCandidateError
import org.jetbrains.kotlin.fir.resolve.diagnostics.ConeOperatorAmbiguityError import org.jetbrains.kotlin.fir.resolve.diagnostics.ConeOperatorAmbiguityError
@@ -86,7 +86,7 @@ internal object FirReferenceResolveHelper {
} }
is FirResolvedNamedReference -> { is FirResolvedNamedReference -> {
val fir = when (val symbol = resolvedSymbol) { val fir = when (val symbol = resolvedSymbol) {
is SyntheticPropertySymbol -> { is FirSyntheticPropertySymbol -> {
val syntheticProperty = symbol.fir as FirSyntheticProperty val syntheticProperty = symbol.fir as FirSyntheticProperty
if (syntheticProperty.getter.delegate.symbol.callableId == symbol.accessorId) { if (syntheticProperty.getter.delegate.symbol.callableId == symbol.accessorId) {
syntheticProperty.getter.delegate syntheticProperty.getter.delegate