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"
}
}