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

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
@@ -3,11 +3,11 @@ package p
class B
class R {
default object {
companion object {
fun B.f() {
this.<caret>
}
}
}
// EXIST: { itemText: "f", tailText: "() for B in R.Default" }
// EXIST: { itemText: "f", tailText: "() for B in R.Companion" }
@@ -4,7 +4,7 @@ class C {
inner class InnerClass
object AnObject
default object {
companion object {
val classObjectField = 0
class ClassObjectClass
@@ -9,7 +9,7 @@ class C {
}
}
default object {
companion object {
fun fromClassObject(){}
}
}
@@ -2,7 +2,7 @@ class A {
class Nested
inner class Inner
default object {
companion object {
class Nested2
val c: Int = 1
object Obj2
@@ -19,7 +19,7 @@ fun some() {
}
// EXIST: Nested
// EXIST: Default
// EXIST: Companion
// EXIST: c
// EXIST: foo
// EXIST: Obj
@@ -2,7 +2,7 @@ class A {
class Nested
inner class Inner
default object Named {
companion object Named {
class Nested2
val c: Int = 1
object Obj2
@@ -2,7 +2,7 @@ class A {
class Nested
inner class Inner
default object Named {
companion object Named {
class Nested2
val c: Int = 1
object Obj2
@@ -1,7 +1,7 @@
package Test.MyTest
class A {
default object {
companion object {
public fun testOther() {
}
@@ -1,5 +1,5 @@
class Some {
default object {
companion object {
val coProp = 12
fun coFun = 12
@@ -2,11 +2,11 @@ package foo
class A {
class B {
default object
companion object
}
}
fun A.B.Default.foo() {}
fun A.B.Companion.foo() {}
fun some() {
A.B.<caret>
@@ -1,7 +1,7 @@
class C {
fun String.memberExtForString(){}
default object {
companion object {
fun foo() {
"".<caret>
}
@@ -8,7 +8,7 @@ fun some() {
}
class Some {
default object {
companion object {
object NamedObjectInClassObject
}
}
@@ -1,9 +1,9 @@
class Test {
default object {
companion object {
class Some
}
}
fun test() {
Test.Default.S<caret>
Test.Companion.S<caret>
}
@@ -1,9 +1,9 @@
class Test {
default object {
companion object {
class Some
}
}
fun test() {
Test.Default.Some
Test.Companion.Some
}
@@ -1,11 +1,11 @@
package a
class Test {
default object {
companion object {
class Some
}
}
fun test() {
a.Test.Default.S<caret>
a.Test.Companion.S<caret>
}
@@ -1,11 +1,11 @@
package a
class Test {
default object {
companion object {
class Some
}
}
fun test() {
a.Test.Default.Some<caret>
a.Test.Companion.Some<caret>
}
@@ -1,7 +1,7 @@
package Test.MyTest
class A {
default object {
companion object {
public fun testOther(a: Int) {
}
@@ -1,7 +1,7 @@
package Test.MyTest
class A {
default object {
companion object {
public fun testOther(a: Int) {
}
@@ -1,7 +1,7 @@
package Test.MyTest
class A {
default object {
companion object {
public fun testOther(a: Boolean) {
}
@@ -1,7 +1,7 @@
package Test.MyTest
class A {
default object {
companion object {
public fun testOther(a: Boolean) {
}
@@ -1,5 +1,5 @@
class AClass {
default object {}
companion object {}
}
fun foo() {
@@ -1,5 +1,5 @@
class AClass {
default object {}
companion object {}
}
fun foo() {
@@ -3,7 +3,7 @@ package pack
class KtClass {
fun foo(){}
default object {
companion object {
fun staticFoo(){}
}
}
@@ -1,9 +1,9 @@
class A {
default object {
companion object {
class Inner {}
}
}
val v: A.Default.Inner = <caret>
val v: A.Companion.Inner = <caret>
// ELEMENT: Inner
@@ -1,9 +1,9 @@
class A {
default object {
companion object {
class Inner {}
}
}
val v: A.Default.Inner = A.Default.Inner()
val v: A.Companion.Inner = A.Companion.Inner()
// ELEMENT: Inner
@@ -1,7 +1,7 @@
package `package`
class `class` {
default object {
companion object {
val `val` = `class`()
}
}
@@ -1,7 +1,7 @@
package `package`
class `class` {
default object {
companion object {
val `val` = `class`()
}
}
@@ -1,7 +1,7 @@
package sample
class K {
default object {
companion object {
fun bar(): K = K()
}
}
@@ -1,7 +1,7 @@
package sample
class K {
default object {
companion object {
fun bar(): K = K()
}
}
@@ -1,7 +1,7 @@
package sample
class K {
default object {
companion object {
fun bar(p: Int): K = K()
}
}
@@ -1,7 +1,7 @@
package sample
class K {
default object {
companion object {
fun bar(p: Int): K = K()
}
}
@@ -1,7 +1,7 @@
package sample
class K {
default object {
companion object {
fun bar(p: () -> Unit): K = K()
}
}
@@ -1,7 +1,7 @@
package sample
class K {
default object {
companion object {
fun bar(p: () -> Unit): K = K()
}
}
@@ -1,7 +1,7 @@
package sample
class K {
default object {
companion object {
fun bar(p: (Int, String) -> Unit): K = K()
}
}
@@ -1,7 +1,7 @@
package sample
class K {
default object {
companion object {
fun bar(p: (Int, String) -> Unit): K = K()
}
}
@@ -1,5 +1,5 @@
class C {
default object {
companion object {
fun f1(): C = C()
fun f2(): C = C()
fun f3(): C? = C()
@@ -1,5 +1,5 @@
class C {
default object {
companion object {
fun f1(): C = C()
fun f2(): C = C()
fun f3(): C? = C()
@@ -1,5 +1,5 @@
class C {
default object {
companion object {
fun f1(): C = C()
fun f2(): C = C()
fun f3(): C? = C()
@@ -1,5 +1,5 @@
class C {
default object {
companion object {
fun f1(): C = C()
fun f2(): C = C()
fun f3(): C? = C()
@@ -1,5 +1,5 @@
class K {
default object {
companion object {
fun bar(): K? = K()
}
}
@@ -1,5 +1,5 @@
class K {
default object {
companion object {
fun bar(): K? = K()
}
}
@@ -1,6 +1,6 @@
public class Testing {
public static void test() {
mockLib.foo.LibClass.Default.<caret>
mockLib.foo.LibClass.Companion.<caret>
}
}
@@ -4,5 +4,5 @@ public class Testing {
}
}
// EXIST: Default
// EXIST: Companion
// EXIST: OBJECT$
@@ -1,6 +1,6 @@
public class Testing {
public static void test() {
mockLib.foo.LibClass.Default.NestedObject.<caret>
mockLib.foo.LibClass.Companion.NestedObject.<caret>
}
}
@@ -1,5 +1,5 @@
public class Testing {
public static void test(mockLib.foo.F.Default.F.Default.<caret>) {
public static void test(mockLib.foo.F.Companion.F.Companion.<caret>) {
}
}
@@ -4,7 +4,7 @@ public class LibClass {
public fun foo() {
}
default object {
companion object {
fun classObjectFun() {
}
@@ -40,9 +40,9 @@ public fun String.topLevelExtFunction(): String = ""
public var topLevelVar: String = ""
class F() {
default object {
companion object {
class F {
default object {
companion object {
object F {
}
}
@@ -1,7 +1,7 @@
package sample
class K {
default object {
companion object {
val foo: K = K()
fun bar(): K = K()
val x: String = ""
@@ -1,7 +1,7 @@
package sample
class K {
default object {
companion object {
val foo: K = K()
fun bar(): K = K()
val x: String = ""
@@ -1,7 +1,7 @@
package sample
class Kool {
default object {
companion object {
val foo: Kool = Kool()
fun bar(): Kool = Kool()
}
@@ -1,5 +1,5 @@
class C {
default object {
companion object {
fun foo(): C {
return <caret>
}
@@ -1,5 +1,5 @@
class X {
default object {
companion object {
fun String.f(): X = X()
fun g(): X = X()
}
@@ -5,7 +5,7 @@ class C {
listOf("a").filter(<caret>)
}
default object {
companion object {
fun staticFoo(s: String): Boolean = true
}
}
@@ -1,5 +1,5 @@
class C<T> {
default object {
companion object {
fun<T> create(t: T): C<T>{}
}
}
@@ -1,5 +1,5 @@
class Name {
default object {
companion object {
fun create(): Name = Name()
}
}
@@ -1,7 +1,7 @@
var global: C = C()
abstract class C {
default object {
companion object {
val INSTANCE = C()
}
}
@@ -3,7 +3,7 @@ var nullableX: C? = null
var nullableFoo: C? = null
abstract class C {
default object {
companion object {
val INSTANCE_X = C()
val INSTANCE_FOO = C()
}