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
@@ -1,7 +1,7 @@
public class ClassObjectField {
public static void foo() {
k.ClassWithClassObject.De<caret>fault.f();
k.ClassWithClassObject.Co<caret>mpanion.f();
}
}
// REF: default object of (k).ClassWithClassObject
// REF: companion object of (k).ClassWithClassObject
@@ -6,4 +6,4 @@ public class ClassObjectField {
}
}
// REF: (k.StaticFieldInClassObjectInTrait.Default).XX
// REF: (k.StaticFieldInClassObjectInTrait.Companion).XX
@@ -4,4 +4,4 @@ public class ClassObjectField {
}
}
// REF: default object of (k).ClassWithClassObject
// REF: companion object of (k).ClassWithClassObject
@@ -16,7 +16,7 @@ public fun topLevelFun() {
}
public class ClassWithClassObject {
default object {
companion object {
fun f() = 1
}
}
@@ -26,7 +26,7 @@ public object KotlinObject {
}
public trait StaticFieldInClassObjectInTrait {
default object {
companion object {
public val XX: String = "xx"
}
}
@@ -1,7 +1,7 @@
package t
class A {
default object Named {
companion object Named {
}
}
@@ -1,7 +1,7 @@
package t
class A {
default object Named {
companion object Named {
val i: Int
}
}
@@ -1,7 +1,7 @@
package t
class A {
default object Default {
companion object Companion {
}
@@ -1,17 +1,17 @@
package t
class A {
default object Default {
companion object Companion {
}
}
fun A.Default.foo() {}
fun A.Companion.foo() {}
fun test() {
<caret>A.foo()
}
// REF: default object of (t).A
// REF: companion object of (t).A
@@ -1,7 +1,7 @@
package t
class A {
default object B {
companion object B {
}
}
@@ -13,5 +13,5 @@ fun test() {
}
// REF: default object of (t).A
// REF: companion object of (t).A
@@ -3,7 +3,7 @@ package t
trait Trait
open class A {
default object Default : Trait {
companion object Companion : Trait {
}
}
@@ -15,5 +15,5 @@ fun test() {
}
// REF: default object of (t).A
// REF: companion object of (t).A
@@ -5,7 +5,7 @@ trait Trait {
}
open class A {
default object Default : Trait {
companion object Companion : Trait {
}
}
@@ -15,5 +15,5 @@ fun test() {
}
// REF: default object of (t).A
// REF: companion object of (t).A
@@ -1,7 +1,7 @@
package t
class A {
default object Default {
companion object Companion {
fun test()
}
}
@@ -11,5 +11,5 @@ fun test() {
}
// REF: default object of (t).A
// REF: companion object of (t).A
@@ -3,7 +3,7 @@ package test
class A
object b {
default object {
companion object {
val x = <caret>A()
}
}
@@ -3,11 +3,11 @@ package test
class A
class Many {
default object {
companion object {
val x = A()
}
default object {
companion object {
val y = <caret>A()
}
}
@@ -1,7 +1,7 @@
package a
class A {
default object Named {
companion object Named {
val i: Int
}
}
@@ -10,4 +10,4 @@ fun main(args: Array<String>) {
A.Na<caret>med.i
}
// REF: default object of (a).A
// REF: companion object of (a).A
@@ -1,7 +1,7 @@
package testing
object Testing {
default object {
companion object {
<caret>va
}
}