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

Determine automatically which types from java.lang is aliased in default imported kotlin packages and exclude them from imported java.lang.* scope.

Browse Source
This commit is contained in:
Ilya Gorbunov
2016-09-22 21:51:49 +03:00
parent 45d42bdff8
commit 5042158df5
6 changed files with 45 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/FileScopeFactory.kt
+1 -1
View File
@@ -95,7 +95,7 @@ class FileScopeFactory(
val allUnderImportResolver = createImportResolver(AllUnderImportsIndexed(imports), bindingTrace) // TODO: should we count excludedImports here also?
val defaultExplicitImportResolver = createImportResolver(ExplicitImportsIndexed(defaultImportsFiltered), tempTrace)
val defaultAllUnderImportResolver = createImportResolver(AllUnderImportsIndexed(defaultImportsFiltered), tempTrace, moduleDescriptor.excludedImports)
val defaultAllUnderImportResolver = createImportResolver(AllUnderImportsIndexed(defaultImportsFiltered), tempTrace, moduleDescriptor.effectivelyExcludedImports)
val dummyContainerDescriptor = DummyContainerDescriptor(file, packageFragment)