From 7cb5c0a6d8fe1397a74023c39d723b84d6c4ef8e Mon Sep 17 00:00:00 2001 From: Simon Ogorodnik Date: Tue, 25 Aug 2020 16:51:50 +0300 Subject: [PATCH] [FIR] Cleanup hides members condition --- .../kotlin/fir/resolve/calls/tower/FirTowerResolveTask.kt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/tower/FirTowerResolveTask.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/tower/FirTowerResolveTask.kt index 8c8ad4c923c..8249e71f1ef 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/tower/FirTowerResolveTask.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/tower/FirTowerResolveTask.kt @@ -311,10 +311,8 @@ internal open class FirTowerResolveTask( explicitReceiverValue: ReceiverValue?, parentGroup: TowerGroup = TowerGroup.EmptyRoot ) { - val shouldProcessExtensionsBeforeMembers = - info.callKind == CallKind.Function && info.name in HIDES_MEMBERS_NAME_LIST - - if (!shouldProcessExtensionsBeforeMembers) return + // We will process hides members only for function calls with name in HIDES_MEMBERS_NAME_LIST + if (info.callKind != CallKind.Function || info.name !in HIDES_MEMBERS_NAME_LIST) return val importingScopes = components.fileImportsScope.asReversed() for ((index, topLevelScope) in importingScopes.withIndex()) {