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

Extract val isNameForHidesMember

Browse Source
This commit is contained in:
Denis Zharkov
2017-08-24 16:41:04 +03:00
parent 1f23d610a6
commit 5b01a32bd3
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/TowerResolver.kt
+3 -2
View File
@@ -114,6 +114,7 @@ class TowerResolver {
private val useOrder: Boolean, private val useOrder: Boolean,
private val name: Name private val name: Name
) { ) {
private val isNameForHidesMember = name in HIDES_MEMBERS_NAME_LIST
private val skippedDataForLookup = mutableListOf<TowerData>() private val skippedDataForLookup = mutableListOf<TowerData>()
private val localLevels: Collection<ScopeTowerLevel> by lazy(LazyThreadSafetyMode.NONE) { private val localLevels: Collection<ScopeTowerLevel> by lazy(LazyThreadSafetyMode.NONE) {
@@ -181,7 +182,7 @@ class TowerResolver {
} }
fun run(): Collection<C> { fun run(): Collection<C> {
if (name in HIDES_MEMBERS_NAME_LIST) { if (isNameForHidesMember) {
// hides members extensions for explicit receiver // hides members extensions for explicit receiver
TowerData.TowerLevel(hidesMembersLevel).process()?.let { return it } TowerData.TowerLevel(hidesMembersLevel).process()?.let { return it }
} }
@@ -220,7 +221,7 @@ class TowerResolver {
} }
private fun processImplicitReceiver(implicitReceiver: ReceiverValueWithSmartCastInfo): Collection<C>? { private fun processImplicitReceiver(implicitReceiver: ReceiverValueWithSmartCastInfo): Collection<C>? {
if (name in HIDES_MEMBERS_NAME_LIST) { if (isNameForHidesMember) {
// hides members extensions // hides members extensions
TowerData.BothTowerLevelAndImplicitReceiver(hidesMembersLevel, implicitReceiver).process()?.let { return it } TowerData.BothTowerLevelAndImplicitReceiver(hidesMembersLevel, implicitReceiver).process()?.let { return it }
} }