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

default -> companion: replace all mentions of default and default object

Browse Source
This commit is contained in:
Pavel V. Talanov
2015-03-16 14:56:06 +03:00
parent a0783757e8
commit 06916d98c6
1019 changed files with 2468 additions and 2469 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/resolve/imports/ImportConflictsWithMappedToJava.resolve
+3 -3
View File
@@ -4,7 +4,7 @@ package test
import testing.custom.*
// Default import has priority over on-demand ones. No conflicts are expected.
// Companion 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.*
// Default imports take over import-on-demand
// Companion imports take over import-on-demand
// TODO: Fix for lazy resolve test
// val a2: 'kotlin::List'List<Int>? = null
@@ -24,7 +24,7 @@ package test
import testing.custom.*
import java.util.*
// Default import has priority over on-demand ones. No conflicts are expected.
// Companion import has priority over on-demand ones. No conflicts are expected.
val a3: `kotlin::List`List<Int>? = null
//FILE:singleClassImportFromJavaUtil.kt