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

Minor. workaround for KT-10679 Wrong outer after inline.

Browse Source
This commit is contained in:
Stanislav Erokhin
2016-01-15 14:43:54 +03:00
parent 3a9ecf0bce
commit 8f441a020e
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/TowerResolver.kt
+5 -4
View File
@@ -72,6 +72,10 @@ class TowerResolver {
return run(context, processor, false, AllCandidatesCollector(context)) return run(context, processor, false, AllCandidatesCollector(context))
} }
private fun ScopeTower.createLocalLevels() = lexicalScope.parentsWithSelf.
filterIsInstance<LexicalScope>().filter { it.kind.withLocalDescriptors }.
map { ScopeBasedTowerLevel(this, it) }
private fun ScopeTower.createNonLocalLevels(): List<ScopeTowerLevel> { private fun ScopeTower.createNonLocalLevels(): List<ScopeTowerLevel> {
val result = ArrayList<ScopeTowerLevel>() val result = ArrayList<ScopeTowerLevel>()
@@ -92,10 +96,7 @@ class TowerResolver {
private fun ScopeTower.createTowerDataList(): List<TowerData> = ArrayList<TowerData>().apply { private fun ScopeTower.createTowerDataList(): List<TowerData> = ArrayList<TowerData>().apply {
operator fun TowerData.unaryPlus() = add(this) operator fun TowerData.unaryPlus() = add(this)
val localLevels = lexicalScope.parentsWithSelf. val localLevels = createLocalLevels()
filterIsInstance<LexicalScope>().filter { it.kind.withLocalDescriptors }.
map { ScopeBasedTowerLevel(this@createTowerDataList, it) }
val nonLocalLevels = createNonLocalLevels() val nonLocalLevels = createNonLocalLevels()
val syntheticLevel = SyntheticScopeBasedTowerLevel(this@createTowerDataList, syntheticScopes) val syntheticLevel = SyntheticScopeBasedTowerLevel(this@createTowerDataList, syntheticScopes)