From 5b01a32bd398ac2f0918b11780a407616e775dcc Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Thu, 24 Aug 2017 16:41:04 +0300 Subject: [PATCH] Extract val isNameForHidesMember --- .../jetbrains/kotlin/resolve/calls/tower/TowerResolver.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/TowerResolver.kt b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/TowerResolver.kt index d8a472491de..8b2700fcc5b 100644 --- a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/TowerResolver.kt +++ b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/TowerResolver.kt @@ -114,6 +114,7 @@ class TowerResolver { private val useOrder: Boolean, private val name: Name ) { + private val isNameForHidesMember = name in HIDES_MEMBERS_NAME_LIST private val skippedDataForLookup = mutableListOf() private val localLevels: Collection by lazy(LazyThreadSafetyMode.NONE) { @@ -181,7 +182,7 @@ class TowerResolver { } fun run(): Collection { - if (name in HIDES_MEMBERS_NAME_LIST) { + if (isNameForHidesMember) { // hides members extensions for explicit receiver TowerData.TowerLevel(hidesMembersLevel).process()?.let { return it } } @@ -220,7 +221,7 @@ class TowerResolver { } private fun processImplicitReceiver(implicitReceiver: ReceiverValueWithSmartCastInfo): Collection? { - if (name in HIDES_MEMBERS_NAME_LIST) { + if (isNameForHidesMember) { // hides members extensions TowerData.BothTowerLevelAndImplicitReceiver(hidesMembersLevel, implicitReceiver).process()?.let { return it } }