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

Changed priority for default imports + default imports include all built-ins explicitly for java module

Browse Source 
#KT-4374 Fixed
This commit is contained in:
Valentin Kipyatkov
2015-01-19 19:17:23 +03:00
parent ae9ebbec7d
commit b9d47ffe7a
14 changed files with 76 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/resolve/imports/ImportConflictsWithMappedToJava.resolve
+5 -5
View File
@@ -4,8 +4,8 @@ package test
import testing.custom.*
// Non default import has priority over default one. No conflicts are expected.
val a1: `custom`List<Int>? = null
// Default import has priority over on-demand ones. No conflicts are expected.
val a1: `kotlin::List`List<Int>? = null
//FILE:javaUtilImport.kt
//----------------------------------------------------------------------------------
@@ -13,7 +13,7 @@ package test
import java.util.*
// Mapped declarations are dropped from on-demand imports.
// Default imports take over import-on-demand
// TODO: Fix for lazy resolve test
// val a2: 'kotlin::List'List<Int>? = null
@@ -24,8 +24,8 @@ package test
import testing.custom.*
import java.util.*
// Mapped declarations are dropped from on-demand "java.util" import. So no conflicts are expected.
val a3: `custom`List<Int>? = null
// Default import has priority over on-demand ones. No conflicts are expected.
val a3: `kotlin::List`List<Int>? = null
//FILE:singleClassImportFromJavaUtil.kt
//----------------------------------------------------------------------------------