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

FIR resolve: check number of parameters when handling Java accessors

Browse Source
This commit is contained in:
Mikhail Glukhikh
2019-05-24 11:08:35 +03:00
parent eaf7e46da3
commit d0404b2c2a
12 changed files with 77 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaClassUseSiteScope.kt
+19 -2
View File
@@ -32,7 +32,7 @@ import org.jetbrains.kotlin.name.Name
class JavaClassUseSiteScope(
klass: FirRegularClass,
session: FirSession,
internal val superTypesScope: FirScope,
private val superTypesScope: FirScope,
private val declaredMemberScope: FirScope
) : FirAbstractProviderBasedScope(session, lookupInFir = true) {
internal val symbol = klass.symbol
@@ -169,10 +169,27 @@ class JavaClassUseSiteScope(
private fun processAccessorFunctionsByName(
propertyName: Name,
accessorName: Name,
isGetter: Boolean,
processor: (ConePropertySymbol) -> ProcessorAction
): ProcessorAction {
val overrideCandidates = mutableSetOf<ConeFunctionSymbol>()
if (!declaredMemberScope.processFunctionsByName(accessorName) { functionSymbol ->
if (functionSymbol is FirFunctionSymbol) {
val fir = functionSymbol.fir
if (fir is FirNamedFunction) {
if (fir.isStatic) {
return@processFunctionsByName ProcessorAction.NEXT
}
when (isGetter) {
true -> if (fir.valueParameters.isNotEmpty()) {
return@processFunctionsByName ProcessorAction.NEXT
}
false -> if (fir.valueParameters.size != 1) {
return@processFunctionsByName ProcessorAction.NEXT
}
}
}
}
overrideCandidates += functionSymbol
val accessorSymbol = FirAccessorSymbol(
accessorId = functionSymbol.callableId,
@@ -207,7 +224,7 @@ class JavaClassUseSiteScope(
) return ProcessorAction.STOP
val getterName = Name.identifier(getterPrefix + name.asString().capitalize())
return processAccessorFunctionsByName(name, getterName, processor)
return processAccessorFunctionsByName(name, getterName, isGetter = true, processor = processor)
}
companion object {