default -> companion: replace all mentions of default and default object
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
package test
|
||||
|
||||
class ConstructorTypeParamClassObjectTypeConflict<test> {
|
||||
default object {
|
||||
companion object {
|
||||
trait test
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@ class ConstructorTypeParamClassObjectTypeConflict<test> {
|
||||
}
|
||||
|
||||
class ConstructorTypeParamClassObjectConflict<test> {
|
||||
default object {
|
||||
companion object {
|
||||
val test = 12
|
||||
}
|
||||
|
||||
@@ -18,7 +18,7 @@ class ConstructorTypeParamClassObjectConflict<test> {
|
||||
}
|
||||
|
||||
class TestConstructorParamClassObjectConflict(test: String) {
|
||||
default object {
|
||||
companion object {
|
||||
val test = 12
|
||||
}
|
||||
|
||||
@@ -27,7 +27,7 @@ class TestConstructorParamClassObjectConflict(test: String) {
|
||||
|
||||
|
||||
class TestConstructorValClassObjectConflict(val test: String) {
|
||||
default object {
|
||||
companion object {
|
||||
val test = 12
|
||||
}
|
||||
|
||||
@@ -35,7 +35,7 @@ class TestConstructorValClassObjectConflict(val test: String) {
|
||||
}
|
||||
|
||||
class TestClassObjectAndClassConflict {
|
||||
default object {
|
||||
companion object {
|
||||
val bla = 12
|
||||
}
|
||||
|
||||
|
||||
@@ -5,8 +5,8 @@ internal final class ConstructorTypeParamClassObjectConflict</*0*/ test> {
|
||||
internal final val some: kotlin.Int = 12
|
||||
internal final fun <get-some>(): kotlin.Int
|
||||
|
||||
internal default object Default {
|
||||
/*primary*/ private constructor Default()
|
||||
internal companion object Companion {
|
||||
/*primary*/ private constructor Companion()
|
||||
internal final val test: kotlin.Int = 12
|
||||
internal final fun <get-test>(): kotlin.Int
|
||||
}
|
||||
@@ -17,8 +17,8 @@ internal final class ConstructorTypeParamClassObjectTypeConflict</*0*/ test> {
|
||||
internal final val some: test?
|
||||
internal final fun <get-some>(): test?
|
||||
|
||||
internal default object Default {
|
||||
/*primary*/ private constructor Default()
|
||||
internal companion object Companion {
|
||||
/*primary*/ private constructor Companion()
|
||||
|
||||
internal trait test {
|
||||
}
|
||||
@@ -32,8 +32,8 @@ internal final class TestClassObjectAndClassConflict {
|
||||
internal final val some: kotlin.String = "More"
|
||||
internal final fun <get-some>(): kotlin.String
|
||||
|
||||
internal default object Default {
|
||||
/*primary*/ private constructor Default()
|
||||
internal companion object Companion {
|
||||
/*primary*/ private constructor Companion()
|
||||
internal final val bla: kotlin.Int = 12
|
||||
internal final fun <get-bla>(): kotlin.Int
|
||||
}
|
||||
@@ -44,8 +44,8 @@ internal final class TestConstructorParamClassObjectConflict {
|
||||
internal final val some: kotlin.String
|
||||
internal final fun <get-some>(): kotlin.String
|
||||
|
||||
internal default object Default {
|
||||
/*primary*/ private constructor Default()
|
||||
internal companion object Companion {
|
||||
/*primary*/ private constructor Companion()
|
||||
internal final val test: kotlin.Int = 12
|
||||
internal final fun <get-test>(): kotlin.Int
|
||||
}
|
||||
@@ -58,8 +58,8 @@ internal final class TestConstructorValClassObjectConflict {
|
||||
internal final val test: kotlin.String
|
||||
internal final fun <get-test>(): kotlin.String
|
||||
|
||||
internal default object Default {
|
||||
/*primary*/ private constructor Default()
|
||||
internal companion object Companion {
|
||||
/*primary*/ private constructor Companion()
|
||||
internal final val test: kotlin.Int = 12
|
||||
internal final fun <get-test>(): kotlin.Int
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
package test
|
||||
|
||||
public class Outer {
|
||||
public default object {
|
||||
public companion object {
|
||||
public object Obj {
|
||||
public val v: String = "val"
|
||||
public fun f(): String = "fun"
|
||||
|
||||
@@ -3,8 +3,8 @@ package test
|
||||
public final class Outer {
|
||||
/*primary*/ public constructor Outer()
|
||||
|
||||
public default object Default {
|
||||
/*primary*/ private constructor Default()
|
||||
public companion object Companion {
|
||||
/*primary*/ private constructor Companion()
|
||||
|
||||
public object Obj {
|
||||
/*primary*/ private constructor Obj()
|
||||
|
||||
Reference in New Issue
Block a user