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

FIR: make FirSyntheticPropertiesScope to be name aware

Browse Source
This commit is contained in:
Ilya Kirillov
2020-12-10 19:38:37 +01:00
parent 8a5f260d04
commit 2201dd5198
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/Synthetics.kt
+8 -5
View File
@@ -11,10 +11,7 @@ import org.jetbrains.kotlin.fir.declarations.FirSimpleFunction
import org.jetbrains.kotlin.fir.declarations.isStatic import org.jetbrains.kotlin.fir.declarations.isStatic
import org.jetbrains.kotlin.fir.declarations.synthetic.buildSyntheticProperty import org.jetbrains.kotlin.fir.declarations.synthetic.buildSyntheticProperty
import org.jetbrains.kotlin.fir.dispatchReceiverClassOrNull import org.jetbrains.kotlin.fir.dispatchReceiverClassOrNull
import org.jetbrains.kotlin.fir.scopes.FirScope import org.jetbrains.kotlin.fir.scopes.*
import org.jetbrains.kotlin.fir.scopes.FirTypeScope
import org.jetbrains.kotlin.fir.scopes.ProcessorAction
import org.jetbrains.kotlin.fir.scopes.processOverriddenFunctionsAndSelf
import org.jetbrains.kotlin.fir.symbols.CallableId import org.jetbrains.kotlin.fir.symbols.CallableId
import org.jetbrains.kotlin.fir.symbols.StandardClassIds import org.jetbrains.kotlin.fir.symbols.StandardClassIds
import org.jetbrains.kotlin.fir.symbols.SyntheticSymbol import org.jetbrains.kotlin.fir.symbols.SyntheticSymbol
@@ -38,7 +35,7 @@ class FirSyntheticFunctionSymbol(
class FirSyntheticPropertiesScope( class FirSyntheticPropertiesScope(
val session: FirSession, val session: FirSession,
private val baseScope: FirTypeScope private val baseScope: FirTypeScope
) : FirScope() { ) : FirScope(), FirContainingNamesAwareScope {
private val syntheticNamesProvider = session.syntheticNamesProvider private val syntheticNamesProvider = session.syntheticNamesProvider
override fun processPropertiesByName(name: Name, processor: (FirVariableSymbol<*>) -> Unit) { override fun processPropertiesByName(name: Name, processor: (FirVariableSymbol<*>) -> Unit) {
@@ -50,6 +47,12 @@ class FirSyntheticPropertiesScope(
} }
} }
override fun getCallableNames(): Set<Name> = baseScope.getCallableNames().flatMapTo(hashSetOf()) { propertyName ->
syntheticNamesProvider.possiblePropertyNamesByAccessorName(propertyName)
}
override fun getClassifierNames(): Set<Name> = emptySet()
private fun checkGetAndCreateSynthetic( private fun checkGetAndCreateSynthetic(
propertyName: Name, propertyName: Name,
getterName: Name, getterName: Name,