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

Rename: generateAccessorSymbol -> generateSyntheticPropertySymbol

Browse Source
This commit is contained in:
Mikhail Glukhikh
2021-10-28 12:32:38 +03:00
committed by teamcity
parent 5a44fda42c
commit 6b1da9eb70
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaClassUseSiteMemberScope.kt
+4 -4
View File
@@ -51,7 +51,7 @@ class JavaClassUseSiteMemberScope(
) { ) {
private val typeParameterStack = klass.javaTypeParameterStack private val typeParameterStack = klass.javaTypeParameterStack
private val specialFunctions = hashMapOf<Name, Collection<FirNamedFunctionSymbol>>() private val specialFunctions = hashMapOf<Name, Collection<FirNamedFunctionSymbol>>()
private val accessorByNameMap = hashMapOf<Name, FirSyntheticPropertySymbol>() private val syntheticPropertyByNameMap = hashMapOf<Name, FirSyntheticPropertySymbol>()
private val canUseSpecialGetters: Boolean by lazy { !klass.hasKotlinSuper(session) } private val canUseSpecialGetters: Boolean by lazy { !klass.hasKotlinSuper(session) }
@@ -65,13 +65,13 @@ class JavaClassUseSiteMemberScope(
return declaredMemberScope.getClassifierNames() + superTypesScope.getClassifierNames() return declaredMemberScope.getClassifierNames() + superTypesScope.getClassifierNames()
} }
private fun generateAccessorSymbol( private fun generateSyntheticPropertySymbol(
getterSymbol: FirNamedFunctionSymbol, getterSymbol: FirNamedFunctionSymbol,
setterSymbol: FirNamedFunctionSymbol?, setterSymbol: FirNamedFunctionSymbol?,
property: FirProperty, property: FirProperty,
takeModalityFromGetter: Boolean, takeModalityFromGetter: Boolean,
): FirSyntheticPropertySymbol { ): FirSyntheticPropertySymbol {
return accessorByNameMap.getOrPut(property.name) { return syntheticPropertyByNameMap.getOrPut(property.name) {
buildSyntheticProperty { buildSyntheticProperty {
moduleData = session.moduleData moduleData = session.moduleData
name = property.name name = property.name
@@ -152,7 +152,7 @@ class JavaClassUseSiteMemberScope(
null null
if (setterSymbol != null && setterSymbol.fir.modality != getterSymbol.fir.modality) return null if (setterSymbol != null && setterSymbol.fir.modality != getterSymbol.fir.modality) return null
return generateAccessorSymbol(getterSymbol, setterSymbol, fir, takeModalityFromGetter) return generateSyntheticPropertySymbol(getterSymbol, setterSymbol, fir, takeModalityFromGetter)
} }
private fun FirPropertySymbol.findGetterOverride( private fun FirPropertySymbol.findGetterOverride(