From 9cd8432c92af3caa3367237e8c8eed2638118698 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Thu, 26 Mar 2020 15:35:57 +0300 Subject: [PATCH] FIR: Minor. Formatting --- .../kotlin/fir/resolve/calls/TowerResolveManager.kt | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/TowerResolveManager.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/TowerResolveManager.kt index 0dac1a60cb3..ec7a9e9fa47 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/TowerResolveManager.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/TowerResolveManager.kt @@ -221,14 +221,16 @@ class TowerResolveManager internal constructor(private val towerResolver: FirTow private fun processInvokeReceiversCandidates(invokeBuiltinExtensionMode: Boolean) { for (invokeReceiverCandidate in invokeReceiverCollector.bestCandidates()) { - val symbol = invokeReceiverCandidate.symbol if (symbol !is FirCallableSymbol<*> && symbol !is FirRegularClassSymbol) continue + val isExtensionFunctionType = (symbol as? FirCallableSymbol<*>)?.fir?.returnTypeRef?.isExtensionFunctionType(towerResolver.components.session) == true + if (invokeBuiltinExtensionMode && !isExtensionFunctionType) { continue } + val extensionReceiverExpression = invokeReceiverCandidate.extensionReceiverExpression() val useImplicitReceiverAsBuiltinInvokeArgument = !invokeBuiltinExtensionMode && isExtensionFunctionType && @@ -335,7 +337,10 @@ class TowerResolveManager internal constructor(private val towerResolver: FirTow } } - data class SuspendedResolverTask(val continuation: Continuation, val group: TowerGroup): Comparable { + private data class SuspendedResolverTask( + val continuation: Continuation, + val group: TowerGroup + ) : Comparable { override fun compareTo(other: SuspendedResolverTask): Int { return group.compareTo(other.group) } @@ -362,10 +367,8 @@ class TowerResolveManager internal constructor(private val towerResolver: FirTow if (resultCollector.isSuccess()) return } } - } - enum class InvokeResolveMode { IMPLICIT_CALL_ON_GIVEN_RECEIVER, RECEIVER_FOR_INVOKE_BUILTIN_EXTENSION