From 7489b9f636cc3807bb94bf92b3a7b24a9bdff141 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Tue, 28 Apr 2020 12:36:02 +0300 Subject: [PATCH] FIR: Minor. Inline processMembersForExplicitReceiver --- .../calls/tower/FirTowerResolverSession.kt | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/tower/FirTowerResolverSession.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/tower/FirTowerResolverSession.kt index af0158f681e..152b4beb206 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/tower/FirTowerResolverSession.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/tower/FirTowerResolverSession.kt @@ -390,7 +390,11 @@ class FirTowerResolverSession internal constructor( val explicitReceiverValue = ExpressionReceiverValue(receiver) processExtensionsThatHideMembers(info, explicitReceiverValue) - processMembersForExplicitReceiver(explicitReceiverValue, info) + + // Member scope of expression receiver + processLevel( + explicitReceiverValue.toMemberScopeTowerLevel(), info, TowerGroup.Member, ExplicitReceiverKind.DISPATCH_RECEIVER + ) val shouldProcessExplicitReceiverScopeOnly = info.callKind == CallKind.Function && info.explicitReceiver?.typeRef?.coneTypeSafe() != null @@ -444,15 +448,6 @@ class FirTowerResolverSession internal constructor( return result } - private suspend fun processMembersForExplicitReceiver( - explicitReceiverValue: ExpressionReceiverValue, - info: CallInfo - ) { - processLevel( - explicitReceiverValue.toMemberScopeTowerLevel(), info, TowerGroup.Member, ExplicitReceiverKind.DISPATCH_RECEIVER - ) - } - private suspend fun processCombinationOfReceivers( implicitReceiverValue: ImplicitReceiverValue<*>, explicitReceiverValue: ExpressionReceiverValue,