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

Support synthetic java properties in REPL

Browse Source 
Use brand new iterable injection
This commit is contained in:
Pavel V. Talanov
2015-07-16 18:03:32 +03:00
parent 07139879cd
commit 2896ec67ba
4 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/FileScopeProviderImpl.kt
+2 -2
View File
@@ -22,7 +22,7 @@ import org.jetbrains.kotlin.storage.get
public class FileScopeProviderImpl(
private val resolveSession: ResolveSession,
private val additionalScopes: FileScopeProvider.AdditionalScopes
private val additionalScopes: Iterable<FileScopeProvider.AdditionalScopes>
) : FileScopeProvider {
private val defaultImports by resolveSession.getStorageManager().createLazyValue {
@@ -37,7 +37,7 @@ public class FileScopeProviderImpl(
private fun createFileScope(file: JetFile): LazyFileScope {
val tempTrace = TemporaryBindingTrace.create(resolveSession.getTrace(), "Transient trace for default imports lazy resolve")
return LazyFileScope.create(
resolveSession, file, defaultImports, additionalScopes.scopes(file),
resolveSession, file, defaultImports, additionalScopes.flatMap { it.scopes(file) },
resolveSession.getTrace(), tempTrace, "LazyFileScope for file " + file.getName()
)
}