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

Minor

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-10-26 19:26:56 +03:00
parent 67a0cc3c49
commit 47f938d7fc
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/utils/ScopeUtils.kt
+2 -1
View File
@@ -296,6 +296,7 @@ inline fun <T: Any> LexicalScope.findFirstFromImportingScopes(fetch: (ImportingS
return findFirstFromMeAndParent { if (it is ImportingScope) fetch(it) else null } return findFirstFromMeAndParent { if (it is ImportingScope) fetch(it) else null }
} }
//TODO: more efficient
fun LexicalScope.addImportScopes(importScopes: Collection<ImportingScope>): LexicalScope { fun LexicalScope.addImportScopes(importScopes: Collection<ImportingScope>): LexicalScope {
return importScopes.fold(this) { scope, importingScope -> scope.addImportScope(importingScope) } return importScopes.fold(this) { scope, importingScope -> scope.addImportScope(importingScope) }
} }
@@ -326,7 +327,7 @@ fun ImportingScope.withParent(newParent: ImportingScope?): ImportingScope {
fun LexicalScope.replaceImportingScopes(importingScopeChain: ImportingScope?): LexicalScope { fun LexicalScope.replaceImportingScopes(importingScopeChain: ImportingScope?): LexicalScope {
return if (this is ImportingScope) return if (this is ImportingScope)
importingScopeChain!! importingScopeChain ?: LexicalScope.Empty
else else
LexicalScopeWrapper(this, importingScopeChain) LexicalScopeWrapper(this, importingScopeChain)
} }