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

FIR Java: use safer cases in use-site scope to allow constructors

Browse Source
This commit is contained in:
Simon Ogorodnik
2019-04-15 16:07:28 +03:00
committed by Mikhail Glukhikh
parent 618295f505
commit 8d2acd790d
1 changed files with 7 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/JavaClassUseSiteScope.kt
+7 -8
View File
@@ -8,11 +8,9 @@ package org.jetbrains.kotlin.fir.java.scopes
import org.jetbrains.kotlin.builtins.jvm.JavaToKotlinClassMap
import org.jetbrains.kotlin.descriptors.Modality
import org.jetbrains.kotlin.fir.FirSession
import org.jetbrains.kotlin.fir.declarations.FirCallableMemberDeclaration
import org.jetbrains.kotlin.fir.declarations.FirNamedFunction
import org.jetbrains.kotlin.fir.declarations.FirProperty
import org.jetbrains.kotlin.fir.declarations.FirRegularClass
import org.jetbrains.kotlin.fir.declarations.*
import org.jetbrains.kotlin.fir.java.toNotNullConeKotlinType
import org.jetbrains.kotlin.fir.resolve.transformers.firUnsafe
import org.jetbrains.kotlin.fir.scopes.FirScope
import org.jetbrains.kotlin.fir.scopes.ProcessorAction
import org.jetbrains.kotlin.fir.scopes.impl.FirAbstractProviderBasedScope
@@ -58,8 +56,8 @@ class JavaClassUseSiteScope(
private fun isEqualTypes(a: FirTypeRef, b: FirTypeRef) =
isEqualTypes(a.toNotNullConeKotlinType(session), b.toNotNullConeKotlinType(session))
private fun isOverriddenFunCheck(overriddenInJava: FirNamedFunction, base: FirNamedFunction): Boolean {
val receiverTypeRef = base.receiverTypeRef
private fun isOverriddenFunCheck(overriddenInJava: FirFunction, base: FirFunction): Boolean {
val receiverTypeRef = (base as FirCallableMemberDeclaration).receiverTypeRef
if (receiverTypeRef == null) {
return overriddenInJava.valueParameters.size == base.valueParameters.size &&
overriddenInJava.valueParameters.zip(base.valueParameters).all { (memberParam, selfParam) ->
@@ -91,9 +89,10 @@ class JavaClassUseSiteScope(
val overriding = when (this) {
is FirFunctionSymbol -> {
val self = fir as FirNamedFunction
val self = firUnsafe<FirFunction>()
self as FirCallableMemberDeclaration
candidates.firstOrNull {
val member = (it as FirFunctionSymbol).fir as FirNamedFunction
val member = (it as FirFunctionSymbol).fir as FirFunction
self.modality != Modality.FINAL && isOverriddenFunCheck(member, self)
}
}