default -> companion: replace all mentions of default and default object
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
fun ~test~test() = 1
|
||||
|
||||
class Test {
|
||||
default object {
|
||||
companion object {
|
||||
fun call() = `test`test()
|
||||
}
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ package test
|
||||
import testing.TestClass
|
||||
|
||||
class WithClassObject {
|
||||
default object {
|
||||
companion object {
|
||||
class ~class-object~TestClass
|
||||
}
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user