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

[FIR] Code cleanup in JavaClassUseSiteMemberScope

Browse Source
This commit is contained in:
Mikhail Glukhikh
2020-11-10 12:21:53 +03:00
parent fb961f7070
commit 2725930460
1 changed files with 3 additions and 8 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
+2 -7
View File
@@ -61,7 +61,7 @@ class JavaClassUseSiteMemberScope(
getterSymbol: FirNamedFunctionSymbol, getterSymbol: FirNamedFunctionSymbol,
setterSymbol: FirNamedFunctionSymbol?, setterSymbol: FirNamedFunctionSymbol?,
syntheticPropertyName: Name, syntheticPropertyName: Name,
): FirAccessorSymbol? { ): FirAccessorSymbol {
return buildSyntheticProperty { return buildSyntheticProperty {
session = this@JavaClassUseSiteMemberScope.session session = this@JavaClassUseSiteMemberScope.session
name = syntheticPropertyName name = syntheticPropertyName
@@ -117,16 +117,11 @@ class JavaClassUseSiteMemberScope(
} }
} }
} }
val accessorSymbol = generateAccessorSymbol( val accessorSymbol = generateAccessorSymbol(getterSymbol!!, setterSymbol, propertyName)
getterSymbol!!, setterSymbol, propertyName
)
if (accessorSymbol != null) {
// NB: accessor should not be processed directly unless we find matching property symbol in supertype
overrideCandidates += accessorSymbol overrideCandidates += accessorSymbol
} }
} }
} }
}
superTypesScope.processPropertiesByName(propertyName) { superTypesScope.processPropertiesByName(propertyName) {
when (val overriddenBy = it.getOverridden(overrideCandidates)) { when (val overriddenBy = it.getOverridden(overrideCandidates)) {