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

Extension function wins against function with no receiver

Browse Source
This commit is contained in:
Stanislav Erokhin
2015-12-14 13:58:53 +03:00
parent a7503303d5
commit cd80d9408d
4 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/TowerResolver.kt
+3 -4
View File
@@ -90,18 +90,17 @@ class TowerResolver {
return null
}
// possible there is explicit member
collectCandidates(TowerData.Empty)?.let { return it }
for (implicitReceiver in context.scopeTower.implicitReceivers) {
collectCandidates(TowerData.OnlyImplicitReceiver(implicitReceiver))?.let { return it }
}
// possible there is explicit member
collectCandidates(TowerData.Empty)?.let { return it }
for (level in context.scopeTower.levels) {
collectCandidates(TowerData.TowerLevel(level))?.let { return it }
for (implicitReceiver in context.scopeTower.implicitReceivers) {
collectCandidates(TowerData.BothTowerLevelAndImplicitReceiver(level, implicitReceiver))?.let { return it }
}
collectCandidates(TowerData.TowerLevel(level))?.let { return it }
}
return resultCollector.getFinalCandidates()