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

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 @@
 package dependency

 class Date {
-    default object {
+    companion object {
        val VALUE = 0
    }
 }
@@ -30,7 +30,7 @@ import java.util.*
  }

  class HTML() : TagWithText("html") {
-    default object : Factory<HTML> {
+    companion object : Factory<HTML> {
      override fun create() = HTML()
    }

@@ -40,7 +40,7 @@ import java.util.*
  }

  class Head() : TagWithText("head") {
-    default object : Factory<Head> {
+    companion object : Factory<Head> {
      override fun create() = Head()
    }

@@ -53,7 +53,7 @@ import java.util.*
  }

  class Body() : BodyTag("body") {
-    default object : Factory<Body> {
+    companion object : Factory<Body> {
      override fun create() = Body()
    }

@@ -1,7 +1,7 @@
 enum class E {
    ENTRY

-    default object {
+    companion object {
        fun foo(): E = ENTRY
        fun bar(): Array<E> = values()
        fun baz(): E = valueOf("ENTRY")
@@ -1,10 +1,10 @@
 package Jet86

 class A {
-  default object {
+  companion object {
    val x = 1
  }
-  <error descr="[MANY_DEFAULT_OBJECTS] Only one default object is allowed per class">default</error> object Another { // error
+  <error descr="[MANY_COMPANION_OBJECTS] Only one companion object is allowed per class">companion</error> object Another { // error
    val x = 1
  }
 }
@@ -14,7 +14,7 @@ class B() {
 }

 object b {
-  <error descr="[DEFAULT_OBJECT_NOT_ALLOWED] A default object is not allowed here">default</error> object {
+  <error descr="[COMPANION_OBJECT_NOT_ALLOWED] A companion object is not allowed here">companion</error> object {
    val x = 1
  }
  // error
@@ -11,7 +11,7 @@ class B {
 }

 class C {
-    default <warning textAttributesKey="DEPRECATED_ATTRIBUTES">class object G</warning> {
+    companion <warning textAttributesKey="DEPRECATED_ATTRIBUTES">class object G</warning> {

    }
 }
@@ -11,7 +11,7 @@ trait B {
 class C() : A(), B

 class D() {
-  default object : A(), B {}
+  companion object : A(), B {}
 }

 class Test1<T : A>()
@@ -3,7 +3,7 @@ import kotlin.platform.platformStatic
 platformStatic
 class <error descr="[PLATFORM_STATIC_ILLEGAL_USAGE] This declaration does not support 'platformStatic'">A</error> {
    platformStatic
-    default <error descr="[PLATFORM_STATIC_ILLEGAL_USAGE] This declaration does not support 'platformStatic'">object</error> {
+    companion <error descr="[PLATFORM_STATIC_ILLEGAL_USAGE] This declaration does not support 'platformStatic'">object</error> {
        platformStatic fun a1() {

        }
@@ -18,21 +18,21 @@ class <error descr="[PLATFORM_STATIC_ILLEGAL_USAGE] This declaration does not su

    fun test() {
        val <warning descr="[UNUSED_VARIABLE] Variable 's' is never used">s</warning> = object {
-            <error descr="[PLATFORM_STATIC_NOT_IN_OBJECT] Only functions in named objects and default objects of classes can be annotated with 'platformStatic'">platformStatic fun a3()</error> {
+            <error descr="[PLATFORM_STATIC_NOT_IN_OBJECT] Only functions in named objects and companion objects of classes can be annotated with 'platformStatic'">platformStatic fun a3()</error> {

            }
        }
    }

-    <error descr="[PLATFORM_STATIC_NOT_IN_OBJECT] Only functions in named objects and default objects of classes can be annotated with 'platformStatic'">platformStatic fun a4()</error> {
+    <error descr="[PLATFORM_STATIC_NOT_IN_OBJECT] Only functions in named objects and companion objects of classes can be annotated with 'platformStatic'">platformStatic fun a4()</error> {

    }
 }

 platformStatic
 trait <error descr="[PLATFORM_STATIC_ILLEGAL_USAGE] This declaration does not support 'platformStatic'">B</error> {
-    default object {
-        <error descr="[PLATFORM_STATIC_NOT_IN_OBJECT] Only functions in named objects and default objects of classes can be annotated with 'platformStatic'">platformStatic fun a1()</error> {
+    companion object {
+        <error descr="[PLATFORM_STATIC_NOT_IN_OBJECT] Only functions in named objects and companion objects of classes can be annotated with 'platformStatic'">platformStatic fun a1()</error> {

        }
    }
@@ -45,13 +45,13 @@ trait <error descr="[PLATFORM_STATIC_ILLEGAL_USAGE] This declaration does not su

    fun test() {
        val <warning descr="[UNUSED_VARIABLE] Variable 's' is never used">s</warning> = object {
-            <error descr="[PLATFORM_STATIC_NOT_IN_OBJECT] Only functions in named objects and default objects of classes can be annotated with 'platformStatic'">platformStatic fun a3()</error> {
+            <error descr="[PLATFORM_STATIC_NOT_IN_OBJECT] Only functions in named objects and companion objects of classes can be annotated with 'platformStatic'">platformStatic fun a3()</error> {

            }
        }
    }

-    <error descr="[PLATFORM_STATIC_NOT_IN_OBJECT] Only functions in named objects and default objects of classes can be annotated with 'platformStatic'">platformStatic fun a4()</error> {
+    <error descr="[PLATFORM_STATIC_NOT_IN_OBJECT] Only functions in named objects and companion objects of classes can be annotated with 'platformStatic'">platformStatic fun a4()</error> {

    }
 }
@@ -1,19 +1,19 @@
 class B {
-    default object <error>A</error> {
+    companion object <error>A</error> {
    }

    val <error>A</error> = this
 }

 class C {
-    default <error>object A</error> {
+    companion <error>object A</error> {
        <error>val A</error> = this
    }

 }

 class D {
-    default <error>object A</error> {
+    companion <error>object A</error> {
        <error>val `OBJECT$`</error> = this
    }

@@ -1,5 +1,5 @@
 class C {
-    default object {
+    companion object {
        <error>val x</error> = 1
        <error>fun getX()</error> = 1
    }
@@ -3,7 +3,7 @@ trait Bar {
 }

 class A {
-    default object : Bar
+    companion object : Bar
 }

 fun test() {
@@ -4,7 +4,7 @@ trait <lineMarker></lineMarker>TestTrait {

 class A {
    class B {
-        default object : TestTrait { // TODO: No line marker
+        companion object : TestTrait { // TODO: No line marker
            override fun <lineMarker descr="Implements function in 'TestTrait'"></lineMarker>test() {
            }
        }
@@ -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()
    }
@@ -40,7 +40,7 @@ class Outer {
 }

 class ClassObject {
-    default object {
+    companion object {
    }
 }

@@ -9,6 +9,6 @@ fun g(t: T): Int {
    B.f()
    A
    B
-    A.Default
-    B.Default
+    A.Companion
+    B.Companion
 }
@@ -3,12 +3,12 @@ package a
 trait T

 class A {
-    default object: T {
+    companion object: T {
    }
 }

 class B {
-    default object {
+    companion object {
        fun f(): Int
    }
 }
@@ -18,8 +18,8 @@ class B {
    B.f()
    A
    B
-    A.Default
-    B.Default
+    A.Companion
+    B.Companion
 }</selection>


@@ -7,7 +7,7 @@ class A {
        f()
    }</selection>

-    default object {
+    companion object {
        fun f()
    }
 }
@@ -2,5 +2,5 @@ package to

 import a.Outer

-fun f(n: Outer.Default.Nested, e: Outer.Default.NestedEnum, o: Outer.Default.NestedObj, t: Outer.Default.NestedTrait, a: Outer.Default.NestedAnnotation) {
+fun f(n: Outer.Companion.Nested, e: Outer.Companion.NestedEnum, o: Outer.Companion.NestedObj, t: Outer.Companion.NestedTrait, a: Outer.Companion.NestedAnnotation) {
 }
@@ -1,13 +1,13 @@
 package a

-import a.Outer.Default.Nested
-import a.Outer.Default.NestedEnum
-import a.Outer.Default.NestedObj
-import a.Outer.Default.NestedTrait
-import a.Outer.Default.NestedAnnotation
+import a.Outer.Companion.Nested
+import a.Outer.Companion.NestedEnum
+import a.Outer.Companion.NestedObj
+import a.Outer.Companion.NestedTrait
+import a.Outer.Companion.NestedAnnotation

 class Outer {
-    default object {
+    companion object {
        class Nested {
        }
        enum class NestedEnum {
@@ -1,7 +1,7 @@
 package a

 class a {
-    default object {
+    companion object {
    }
 }

@@ -37,6 +37,6 @@ class Outer {
 }

 class ClassObject {
-    default object {
+    companion object {
    }
 }
@@ -38,6 +38,6 @@ class Outer {
 }

 class ClassObject {
-    default object {
+    companion object {
    }
 }
@@ -40,7 +40,7 @@ class Outer {
 }

 class ClassObject {
-    default object {
+    companion object {
    }
 }

@@ -19,7 +19,7 @@ object O2 {
 }

 class ClassObject {
-    default object {
+    companion object {
    }
 }

@@ -19,7 +19,7 @@ object O2 {
 }

 class ClassObject {
-    default object {
+    companion object {
    }
 }

@@ -1,11 +1,11 @@
 class A {
-    default object {
+    companion object {

        {
            1 + 1 // A
            val a = 1 // A
            fun foo() {
-                1 // A\$Default\$1
+                1 // A\$Companion\$1
            }
        }

@@ -13,23 +13,23 @@ class A {

        val prop2: Int
            get() {
-                val a = 1 + 1  // A\$Default
-                return 1 // A\$Default
+                val a = 1 + 1  // A\$Companion
+                return 1 // A\$Companion
            }

        val prop3: Int
-            get() = 1 // A\$Default
+            get() = 1 // A\$Companion

-        fun foo() = 1 // A\$Default
+        fun foo() = 1 // A\$Companion

        fun foo2() {
-            ""   // A\$Default
+            ""   // A\$Companion

            val o = object {
-                val p = 1 // A\$Default\$foo2\$o\$1
+                val p = 1 // A\$Companion\$foo2\$o\$1
                val p2: Int
                    get() {
-                        return 1 // A\$Default\$foo2\$o\$1
+                        return 1 // A\$Companion\$foo2\$o\$1
                    }
            }
        }
@@ -37,7 +37,7 @@ class A {
 }

 trait T {
-    default object {
-        val prop = 1 // T\$Default
+    companion object {
+        val prop = 1 // T\$Companion
    }
 }
@@ -11,7 +11,7 @@ fun main(args: Array<String>) {
 }

 class A {
-    default object {
+    companion object {
        val prop = 1
        fun myFun() = 1
    }
@@ -10,7 +10,7 @@ class MyClass {
        val a = 1
    }

-    default object {
+    companion object {
        val coProp = 1
    }
 }
@@ -8,7 +8,7 @@ fun main(args: Array<String>) {
 class TestClass {
    fun testFun() = 1

-    default object {
+    companion object {
        val p = 1
    }
 }
@@ -5,7 +5,7 @@ fun main(args: Array<String>) {
 }

 class A {
-    default object {
+    companion object {
        val prop = 1
        fun myFun() = 1
    }
@@ -12,7 +12,7 @@ class A {
        prop = 2
    }

-    default object {
+    companion object {
        private fun foo() {
            val a = 1
        }
@@ -31,7 +31,7 @@ class A {
        f()
    }

-    default object {
+    companion object {
        fun test() {
            lambda {
                val a = 1
@@ -6,7 +6,7 @@ class A {
        foo()
    }

-    default object {
+    companion object {
        fun foo() {
            val a = 1
        }
@@ -1,7 +1,7 @@
 package classObjectFunFromTopLevel

 class A {
-    default object {
+    companion object {
        fun bar() {
            val a = 1
        }
@@ -4,7 +4,7 @@
 package test

 internal final class ClassWithClassObject() {
-    internal default object {
+    internal companion object {
        internal final val a: test.A /* compiled code */

        public final var b: test.B /* compiled code */
@@ -4,7 +4,7 @@ class ClassWithClassObject {
    fun f() {
    }

-    default object {
+    companion object {
        fun f() {
        }

@@ -4,5 +4,5 @@
 package test

 public final class DependencyOnNestedClasses() : dependency.D.Nested {
-    internal final fun f(nc: dependency.D.Default.NestedInClassObject, i: dependency.D.Inner, ii: dependency.D.Inner.Inner, nn: dependency.D.Nested.Nested): dependency.D.Nested { /* compiled code */ }
+    internal final fun f(nc: dependency.D.Companion.NestedInClassObject, i: dependency.D.Inner, ii: dependency.D.Inner.Inner, nn: dependency.D.Nested.Nested): dependency.D.Nested { /* compiled code */ }
 }
@@ -8,7 +8,7 @@ class D {
        class Nested
    }

-    default object {
+    companion object {
        class NestedInClassObject
    }
 }
@@ -3,7 +3,7 @@ package test
 import dependency.*

 public class DependencyOnNestedClasses : D.Nested() {
-    fun f(nc: D.Default.NestedInClassObject, i: D.Inner, ii: D.Inner.Inner, nn: D.Nested.Nested): D.Nested {
+    fun f(nc: D.Companion.NestedInClassObject, i: D.Inner, ii: D.Inner.Inner, nn: D.Nested.Nested): D.Nested {
        return D.Nested()
    }
 }
@@ -4,7 +4,7 @@
 package testData.libraries

 [[public final class WithInnerAndObject() {
-    [[public default object {
+    [[public companion object {
        [internal final fun foo(): kotlin.Unit { /* compiled code */ }]
    }]]

@@ -4,6 +4,6 @@
 package testData.libraries

 [[public final class WithTraitClassObject() {
-    [[public default object : testData.libraries.SimpleTrait {
+    [[public companion object : testData.libraries.SimpleTrait {
    }]]
 }]]
@@ -10,7 +10,7 @@ public class SimpleTraitImpl : SimpleTrait {
 }

 public class WithInnerAndObject {
-    default object {
+    companion object {
        fun foo() {
        }
    }
@@ -23,7 +23,7 @@ public class WithInnerAndObject {
 }

 public class WithTraitClassObject {
-    default object : SimpleTrait
+    companion object : SimpleTrait
 }

 public abstract class AbstractClass {
@@ -5,5 +5,5 @@ fun foo() {
 }

 // main.kt
-//    default <1>object {
+//    companion <1>object {
 //        fun <2>foo() {
@@ -17,7 +17,7 @@ a public class Annotations private [a] (private [a] val c1: Int, [a] val c2: Int
        [a] private set


-    private b(E.E2) default object {
+    private b(E.E2) companion object {

    }
 }
@@ -33,8 +33,8 @@ PsiJetFileStubImpl[package=]
              REFERENCE_EXPRESSION:[referencedName=kotlin]
            REFERENCE_EXPRESSION:[referencedName=Int]
    CLASS_BODY:
-      OBJECT_DECLARATION:[fqName=Annotations.Default, isDefault=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Default, superNames=[]]
-        MODIFIER_LIST:[private default]
+      OBJECT_DECLARATION:[fqName=Annotations.Companion, isDefault=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Companion, superNames=[]]
+        MODIFIER_LIST:[private companion]
          ANNOTATION_ENTRY:[hasValueArguments=false, shortName=b]
            CONSTRUCTOR_CALLEE:
              TYPE_REFERENCE:
@@ -6,7 +6,7 @@ class ClassObject {

    val c = 1

-    public default object {
+    public companion object {
        val j = 0
        fun z() = 0

@@ -20,11 +20,11 @@ class ClassObject {


    class B {
-        default object {
+        companion object {
            class C {
-                default object {
+                companion object {
                    class D {
-                        default object {
+                        companion object {
                            val i = 3
                            fun f() {
                            }
@@ -7,17 +7,17 @@ PsiJetFileStubImpl[package=test.class_object]
    MODIFIER_LIST:[internal final]
    VALUE_PARAMETER_LIST:
    CLASS_BODY:
-      OBJECT_DECLARATION:[fqName=test.class_object.ClassObject.Default, isDefault=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Default, superNames=[]]
-        MODIFIER_LIST:[public default]
+      OBJECT_DECLARATION:[fqName=test.class_object.ClassObject.Companion, isDefault=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Companion, superNames=[]]
+        MODIFIER_LIST:[public companion]
        CLASS_BODY:
-          PROPERTY:[fqName=test.class_object.ClassObject.Default.j, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReceiverTypeRef=false, hasReturnTypeRef=true, isProbablyNothingType=false, isTopLevel=false, isVar=false, name=j]
+          PROPERTY:[fqName=test.class_object.ClassObject.Companion.j, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReceiverTypeRef=false, hasReturnTypeRef=true, isProbablyNothingType=false, isTopLevel=false, isVar=false, name=j]
            MODIFIER_LIST:[internal final]
            TYPE_REFERENCE:
              USER_TYPE:[isAbsoluteInRootPackage=false]
                USER_TYPE:[isAbsoluteInRootPackage=false]
                  REFERENCE_EXPRESSION:[referencedName=kotlin]
                REFERENCE_EXPRESSION:[referencedName=Int]
-          FUN:[fqName=test.class_object.ClassObject.Default.z, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isProbablyNothingType=false, isTopLevel=false, name=z]
+          FUN:[fqName=test.class_object.ClassObject.Companion.z, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isProbablyNothingType=false, isTopLevel=false, name=z]
            MODIFIER_LIST:[internal final]
            VALUE_PARAMETER_LIST:
            TYPE_REFERENCE:
@@ -25,22 +25,22 @@ PsiJetFileStubImpl[package=test.class_object]
                USER_TYPE:[isAbsoluteInRootPackage=false]
                  REFERENCE_EXPRESSION:[referencedName=kotlin]
                REFERENCE_EXPRESSION:[referencedName=Int]
-          CLASS:[fqName=test.class_object.ClassObject.Default.A, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=false, name=A, superNames=[]]
+          CLASS:[fqName=test.class_object.ClassObject.Companion.A, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=false, name=A, superNames=[]]
            MODIFIER_LIST:[internal final]
            VALUE_PARAMETER_LIST:
            CLASS_BODY:
-              CLASS:[fqName=test.class_object.ClassObject.Default.A.B, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=false, name=B, superNames=[]]
+              CLASS:[fqName=test.class_object.ClassObject.Companion.A.B, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=false, name=B, superNames=[]]
                MODIFIER_LIST:[internal final]
                VALUE_PARAMETER_LIST:
                CLASS_BODY:
-                  PROPERTY:[fqName=test.class_object.ClassObject.Default.A.B.i, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReceiverTypeRef=false, hasReturnTypeRef=true, isProbablyNothingType=false, isTopLevel=false, isVar=false, name=i]
+                  PROPERTY:[fqName=test.class_object.ClassObject.Companion.A.B.i, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReceiverTypeRef=false, hasReturnTypeRef=true, isProbablyNothingType=false, isTopLevel=false, isVar=false, name=i]
                    MODIFIER_LIST:[internal final]
                    TYPE_REFERENCE:
                      USER_TYPE:[isAbsoluteInRootPackage=false]
                        USER_TYPE:[isAbsoluteInRootPackage=false]
                          REFERENCE_EXPRESSION:[referencedName=kotlin]
                        REFERENCE_EXPRESSION:[referencedName=Int]
-                  FUN:[fqName=test.class_object.ClassObject.Default.A.B.f, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isProbablyNothingType=false, isTopLevel=false, name=f]
+                  FUN:[fqName=test.class_object.ClassObject.Companion.A.B.f, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isProbablyNothingType=false, isTopLevel=false, name=f]
                    MODIFIER_LIST:[internal final]
                    VALUE_PARAMETER_LIST:
                    TYPE_REFERENCE:
@@ -67,31 +67,31 @@ PsiJetFileStubImpl[package=test.class_object]
        MODIFIER_LIST:[internal final]
        VALUE_PARAMETER_LIST:
        CLASS_BODY:
-          OBJECT_DECLARATION:[fqName=test.class_object.ClassObject.B.Default, isDefault=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Default, superNames=[]]
-            MODIFIER_LIST:[internal default]
+          OBJECT_DECLARATION:[fqName=test.class_object.ClassObject.B.Companion, isDefault=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Companion, superNames=[]]
+            MODIFIER_LIST:[internal companion]
            CLASS_BODY:
-              CLASS:[fqName=test.class_object.ClassObject.B.Default.C, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=false, name=C, superNames=[]]
+              CLASS:[fqName=test.class_object.ClassObject.B.Companion.C, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=false, name=C, superNames=[]]
                MODIFIER_LIST:[internal final]
                VALUE_PARAMETER_LIST:
                CLASS_BODY:
-                  OBJECT_DECLARATION:[fqName=test.class_object.ClassObject.B.Default.C.Default, isDefault=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Default, superNames=[]]
-                    MODIFIER_LIST:[internal default]
+                  OBJECT_DECLARATION:[fqName=test.class_object.ClassObject.B.Companion.C.Companion, isDefault=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Companion, superNames=[]]
+                    MODIFIER_LIST:[internal companion]
                    CLASS_BODY:
-                      CLASS:[fqName=test.class_object.ClassObject.B.Default.C.Default.D, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=false, name=D, superNames=[]]
+                      CLASS:[fqName=test.class_object.ClassObject.B.Companion.C.Companion.D, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=false, name=D, superNames=[]]
                        MODIFIER_LIST:[internal final]
                        VALUE_PARAMETER_LIST:
                        CLASS_BODY:
-                          OBJECT_DECLARATION:[fqName=test.class_object.ClassObject.B.Default.C.Default.D.Default, isDefault=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Default, superNames=[]]
-                            MODIFIER_LIST:[internal default]
+                          OBJECT_DECLARATION:[fqName=test.class_object.ClassObject.B.Companion.C.Companion.D.Companion, isDefault=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Companion, superNames=[]]
+                            MODIFIER_LIST:[internal companion]
                            CLASS_BODY:
-                              PROPERTY:[fqName=test.class_object.ClassObject.B.Default.C.Default.D.Default.i, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReceiverTypeRef=false, hasReturnTypeRef=true, isProbablyNothingType=false, isTopLevel=false, isVar=false, name=i]
+                              PROPERTY:[fqName=test.class_object.ClassObject.B.Companion.C.Companion.D.Companion.i, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReceiverTypeRef=false, hasReturnTypeRef=true, isProbablyNothingType=false, isTopLevel=false, isVar=false, name=i]
                                MODIFIER_LIST:[internal final]
                                TYPE_REFERENCE:
                                  USER_TYPE:[isAbsoluteInRootPackage=false]
                                    USER_TYPE:[isAbsoluteInRootPackage=false]
                                      REFERENCE_EXPRESSION:[referencedName=kotlin]
                                    REFERENCE_EXPRESSION:[referencedName=Int]
-                              FUN:[fqName=test.class_object.ClassObject.B.Default.C.Default.D.Default.f, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isProbablyNothingType=false, isTopLevel=false, name=f]
+                              FUN:[fqName=test.class_object.ClassObject.B.Companion.C.Companion.D.Companion.f, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isProbablyNothingType=false, isTopLevel=false, name=f]
                                MODIFIER_LIST:[internal final]
                                VALUE_PARAMETER_LIST:
                                TYPE_REFERENCE:
@@ -99,7 +99,7 @@ PsiJetFileStubImpl[package=test.class_object]
                                    USER_TYPE:[isAbsoluteInRootPackage=false]
                                      REFERENCE_EXPRESSION:[referencedName=kotlin]
                                    REFERENCE_EXPRESSION:[referencedName=Unit]
-                              CLASS:[fqName=test.class_object.ClassObject.B.Default.C.Default.D.Default.Anno, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=false, name=Anno, superNames=[Annotation]]
+                              CLASS:[fqName=test.class_object.ClassObject.B.Companion.C.Companion.D.Companion.Anno, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=false, name=Anno, superNames=[Annotation]]
                                MODIFIER_LIST:[annotation internal final]
                                VALUE_PARAMETER_LIST:
                                DELEGATION_SPECIFIER_LIST:
@@ -110,7 +110,7 @@ PsiJetFileStubImpl[package=test.class_object]
                                          REFERENCE_EXPRESSION:[referencedName=kotlin]
                                        REFERENCE_EXPRESSION:[referencedName=Annotation]
                                CLASS_BODY:
-                              CLASS:[fqName=test.class_object.ClassObject.B.Default.C.Default.D.Default.En, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=false, name=En, superNames=[Enum]]
+                              CLASS:[fqName=test.class_object.ClassObject.B.Companion.C.Companion.D.Companion.En, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=false, name=En, superNames=[Enum]]
                                MODIFIER_LIST:[enum internal final]
                                VALUE_PARAMETER_LIST:
                                DELEGATION_SPECIFIER_LIST:
@@ -137,10 +137,10 @@ PsiJetFileStubImpl[package=test.class_object]
                                                                REFERENCE_EXPRESSION:[referencedName=class_object]
                                                              REFERENCE_EXPRESSION:[referencedName=ClassObject]
                                                            REFERENCE_EXPRESSION:[referencedName=B]
-                                                          REFERENCE_EXPRESSION:[referencedName=Default]
+                                                          REFERENCE_EXPRESSION:[referencedName=Companion]
                                                        REFERENCE_EXPRESSION:[referencedName=C]
-                                                      REFERENCE_EXPRESSION:[referencedName=Default]
+                                                      REFERENCE_EXPRESSION:[referencedName=Companion]
                                                    REFERENCE_EXPRESSION:[referencedName=D]
-                                                  REFERENCE_EXPRESSION:[referencedName=Default]
+                                                  REFERENCE_EXPRESSION:[referencedName=Companion]
                                                REFERENCE_EXPRESSION:[referencedName=En]
                                CLASS_BODY:
--- a/Show More
+++ b/Show More