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

FirTowerResolver: code cleanup

Browse Source
This commit is contained in:
Mikhail Glukhikh
2020-02-19 19:24:14 +03:00
parent f1a418373c
commit 17b473fcb6
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/FirTowerResolver.kt
+6 -10
View File
@@ -106,7 +106,6 @@ class FirTowerResolver(
private suspend fun runResolverForQualifierReceiver( private suspend fun runResolverForQualifierReceiver(
info: CallInfo, info: CallInfo,
collector: CandidateCollector,
resolvedQualifier: FirResolvedQualifier, resolvedQualifier: FirResolvedQualifier,
manager: TowerResolveManager manager: TowerResolveManager
) { ) {
@@ -129,11 +128,11 @@ class FirTowerResolver(
// NB: yet built-in Unit is used for "no-value" type // NB: yet built-in Unit is used for "no-value" type
if (info.callKind == CallKind.CallableReference) { if (info.callKind == CallKind.CallableReference) {
if (info.stubReceiver != null || typeRef !is FirImplicitBuiltinTypeRef) { if (info.stubReceiver != null || typeRef !is FirImplicitBuiltinTypeRef) {
runResolverForExpressionReceiver(info, collector, resolvedQualifier, manager) runResolverForExpressionReceiver(info, resolvedQualifier, manager)
} }
} else { } else {
if (typeRef !is FirImplicitBuiltinTypeRef) { if (typeRef !is FirImplicitBuiltinTypeRef) {
runResolverForExpressionReceiver(info, collector, resolvedQualifier, manager) runResolverForExpressionReceiver(info, resolvedQualifier, manager)
} }
} }
} }
@@ -142,7 +141,6 @@ class FirTowerResolver(
private suspend fun runResolverForNoReceiver( private suspend fun runResolverForNoReceiver(
info: CallInfo, info: CallInfo,
collector: CandidateCollector,
manager: TowerResolveManager manager: TowerResolveManager
) { ) {
val shouldProcessExtensionsBeforeMembers = val shouldProcessExtensionsBeforeMembers =
@@ -243,7 +241,6 @@ class FirTowerResolver(
private suspend fun runResolverForExpressionReceiver( private suspend fun runResolverForExpressionReceiver(
info: CallInfo, info: CallInfo,
collector: CandidateCollector,
receiver: FirExpression, receiver: FirExpression,
manager: TowerResolveManager manager: TowerResolveManager
) { ) {
@@ -349,7 +346,6 @@ class FirTowerResolver(
private suspend fun runResolverForSuperReceiver( private suspend fun runResolverForSuperReceiver(
info: CallInfo, info: CallInfo,
collector: CandidateCollector,
superTypeRef: FirTypeRef, superTypeRef: FirTypeRef,
manager: TowerResolveManager manager: TowerResolveManager
) { ) {
@@ -480,16 +476,16 @@ class FirTowerResolver(
when (val receiver = info.explicitReceiver) { when (val receiver = info.explicitReceiver) {
is FirResolvedQualifier -> manager.enqueueResolverTask { runResolverForQualifierReceiver(info, collector, receiver, manager) } is FirResolvedQualifier -> manager.enqueueResolverTask { runResolverForQualifierReceiver(info, receiver, manager) }
null -> manager.enqueueResolverTask { runResolverForNoReceiver(info, collector, manager) } null -> manager.enqueueResolverTask { runResolverForNoReceiver(info, manager) }
else -> run { else -> run {
if (receiver is FirQualifiedAccessExpression) { if (receiver is FirQualifiedAccessExpression) {
val calleeReference = receiver.calleeReference val calleeReference = receiver.calleeReference
if (calleeReference is FirSuperReference) { if (calleeReference is FirSuperReference) {
return@run manager.enqueueResolverTask { runResolverForSuperReceiver(info, collector, receiver.typeRef, manager) } return@run manager.enqueueResolverTask { runResolverForSuperReceiver(info, receiver.typeRef, manager) }
} }
} }
manager.enqueueResolverTask { runResolverForExpressionReceiver(info, collector, receiver, manager) } manager.enqueueResolverTask { runResolverForExpressionReceiver(info, receiver, manager) }
} }
} }
manager.runTasks() manager.runTasks()