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

[FIR] Cleanup code and fix type check in SAM resolution

Browse Source
This commit is contained in:
Mikhail Glukhikh
2020-01-09 18:10:58 +03:00
parent c464322b3a
commit 6b4e5bc2f0
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/SamResolution.kt
+3 -3
View File
@@ -22,6 +22,7 @@ import org.jetbrains.kotlin.fir.scopes.ProcessorAction
import org.jetbrains.kotlin.fir.scopes.scope import org.jetbrains.kotlin.fir.scopes.scope
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.impl.FirPropertySymbol
import org.jetbrains.kotlin.fir.symbols.impl.FirRegularClassSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirRegularClassSymbol
import org.jetbrains.kotlin.fir.symbols.impl.FirTypeParameterSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirTypeParameterSymbol
import org.jetbrains.kotlin.fir.symbols.impl.FirVariableSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirVariableSymbol
@@ -144,7 +145,7 @@ class FirSamResolverImpl(
newTypeParameter.bounds += oldTypeParameter.bounds.mapNotNull { typeRef -> newTypeParameter.bounds += oldTypeParameter.bounds.mapNotNull { typeRef ->
FirResolvedTypeRefImpl( FirResolvedTypeRefImpl(
typeRef.source, typeRef.source,
substitutor.substituteOrSelf(typeRef.coneTypeSafe<ConeKotlinType>() ?: return@mapNotNull null) substitutor.substituteOrSelf(typeRef.coneTypeSafe() ?: return@mapNotNull null)
) )
} }
} }
@@ -250,11 +251,10 @@ private fun FirRegularClass.findSingleAbstractMethodByNames(
val classUseSiteMemberScope = this.scope(ConeSubstitutor.Empty, session, scopeSession) val classUseSiteMemberScope = this.scope(ConeSubstitutor.Empty, session, scopeSession)
for (candidateName in samCandidateNames) { for (candidateName in samCandidateNames) {
if (classUseSiteMemberScope == null) break
if (metIncorrectMember) break if (metIncorrectMember) break
classUseSiteMemberScope.processPropertiesByName(candidateName) { classUseSiteMemberScope.processPropertiesByName(candidateName) {
if ((it as? FirProperty)?.modality == Modality.ABSTRACT) { if ((it as? FirPropertySymbol)?.fir?.modality == Modality.ABSTRACT) {
metIncorrectMember = true metIncorrectMember = true
ProcessorAction.STOP ProcessorAction.STOP
} else { } else {