Replace 'class object' with 'default object' in renderers and test data

Includes changes to decompiled text
Old syntax is used in builtins and project code for now

compiler/testData/diagnostics/tests/MultipleBounds.kt

@@ -17,7 +17,7 @@ trait G<X> {
 class C() : A(), B
 
 class D() {
-  class object : A(), B {}
+  default object : A(), B {}
 }
 
 class Test1<T : A>()

compiler/testData/diagnostics/tests/MultipleBounds.txt

@@ -52,7 +52,7 @@ package Jet87 {
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-        internal class object Default : Jet87.A, Jet87.B {
+        internal default object Default : Jet87.A, Jet87.B {
             private constructor Default()
             internal open override /*1*/ /*fake_override*/ fun bar(): kotlin.Double
             public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean

compiler/testData/diagnostics/tests/annotations/annotationModifier.kt

@@ -1,7 +1,7 @@
 annotation class B
 
 class A {
-   <!ILLEGAL_ANNOTATION_KEYWORD!>annotation<!> class object {}
+   <!ILLEGAL_ANNOTATION_KEYWORD!>annotation<!> default object {}
 }
 
 <!ILLEGAL_ANNOTATION_KEYWORD!>annotation<!> object O {}

compiler/testData/diagnostics/tests/annotations/annotationModifier.txt

@@ -10,7 +10,7 @@ internal final class A {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-    internal class object Default {
+    internal default object Default {
         private constructor Default()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/annotations/kt1886annotationBody.kt

@@ -11,7 +11,7 @@ annotation class Annotation4() <!ANNOTATION_CLASS_WITH_BODY!>{
 }<!>
 
 annotation class Annotation5() <!ANNOTATION_CLASS_WITH_BODY!>{
-    class object {}
+    default object {}
 }<!>
 
 annotation class Annotation6() <!ANNOTATION_CLASS_WITH_BODY!>{

compiler/testData/diagnostics/tests/annotations/kt1886annotationBody.txt

@@ -50,7 +50,7 @@ internal final annotation class Annotation5 : kotlin.Annotation {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-    internal class object Default {
+    internal default object Default {
         private constructor Default()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/cast/WhenWithExpression.kt

@@ -1,5 +1,5 @@
 class List<out T>(val size : Int) {
-    class object {
+    default object {
         val Nil = List<Nothing>(0)
     }
 }

compiler/testData/diagnostics/tests/cast/WhenWithExpression.txt

@@ -9,7 +9,7 @@ internal final class List</*0*/ out T> {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-    internal class object Default {
+    internal default object Default {
         private constructor Default()
         internal final val Nil: List<kotlin.Nothing>
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean

compiler/testData/diagnostics/tests/classObjects/ClassObjectCannotAccessClassFields.kt

@@ -3,7 +3,7 @@
 class A() {
     val x = 1
 
-    class object {
+    default object {
         val y = <!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>x<!>
     }
 }

compiler/testData/diagnostics/tests/classObjects/ClassObjectCannotAccessClassFields.txt

@@ -7,7 +7,7 @@ internal final class A {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-    internal class object Default {
+    internal default object Default {
         private constructor Default()
         internal final val y: kotlin.Int = 1
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean

compiler/testData/diagnostics/tests/classObjects/ClassObjectVisibility.kt

@@ -9,7 +9,7 @@ fun test() {
 }
 
 class A() {
-  public class object {
+  public default object {
     val d = 3
     private object f {
 
@@ -19,12 +19,12 @@ class A() {
 
 class B {
     class D {
-        private class object
+        private default object
     }
 }
 
 class CCC() {
-  private class object {
+  private default object {
     val classObjectVar = 3
   }
 }

compiler/testData/diagnostics/tests/classObjects/ClassObjectVisibility.txt

@@ -9,7 +9,7 @@ package foo {
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-        public class object Default {
+        public default object Default {
             private constructor Default()
             internal final val d: kotlin.Int = 3
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -37,7 +37,7 @@ package foo {
             public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-            private class object Default {
+            private default object Default {
                 private constructor Default()
                 public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
                 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -52,7 +52,7 @@ package foo {
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-        private class object Default {
+        private default object Default {
             private constructor Default()
             internal final val classObjectVar: kotlin.Int = 3
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean

compiler/testData/diagnostics/tests/classObjects/ClassObjects.kt

@@ -1,22 +1,22 @@
 package Jet86
 
 class A {
-  <!REDECLARATION!>class object<!> {
+  default <!REDECLARATION!>object<!> {
     val x = 1
   }
-  <!MANY_DEFAULT_OBJECTS, REDECLARATION!>class object<!> {
+  default <!MANY_DEFAULT_OBJECTS, REDECLARATION!>object<!> {
     val x = 1
   }
 }
 
 class AA {
-  class object {
+  default object {
     val x = 1
   }
-  <!MANY_DEFAULT_OBJECTS!>class object A<!> {
+  default <!MANY_DEFAULT_OBJECTS!>object A<!> {
     val x = 1
   }
-    <!MANY_DEFAULT_OBJECTS!>class object AA<!> {
+    default <!MANY_DEFAULT_OBJECTS!>object AA<!> {
     val x = 1
   }
 }
@@ -26,7 +26,7 @@ class B() {
 }
 
 object b {
-  <!DEFAULT_OBJECT_NOT_ALLOWED!>class object<!> {
+  default <!DEFAULT_OBJECT_NOT_ALLOWED!>object<!> {
     val x = 1
   } // error
 }

compiler/testData/diagnostics/tests/classObjects/ClassObjects.txt

@@ -13,7 +13,7 @@ package Jet86 {
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-        internal class object Default {
+        internal default object Default {
             private constructor Default()
             internal final val x: kotlin.Int = 1
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -21,7 +21,7 @@ package Jet86 {
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
         }
 
-        internal class object Default {
+        internal default object Default {
             private constructor Default()
             internal final val x: kotlin.Int = 1
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -36,7 +36,7 @@ package Jet86 {
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-        internal class object A {
+        internal default object A {
             private constructor A()
             internal final val x: kotlin.Int = 1
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -44,7 +44,7 @@ package Jet86 {
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
         }
 
-        internal class object AA {
+        internal default object AA {
             private constructor AA()
             internal final val x: kotlin.Int = 1
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -52,7 +52,7 @@ package Jet86 {
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
         }
 
-        internal class object Default {
+        internal default object Default {
             private constructor Default()
             internal final val x: kotlin.Int = 1
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -75,7 +75,7 @@ package Jet86 {
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-        internal class object Default {
+        internal default object Default {
             private constructor Default()
             internal final val x: kotlin.Int = 1
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean

compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughClassObject.kt

@@ -5,7 +5,7 @@ class A {
     inner class Inner
 
 
-    class object {
+    default object {
 
         class Nested2
 

compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughClassObject.txt

@@ -9,7 +9,7 @@ package a {
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-        internal class object Default {
+        internal default object Default {
             private constructor Default()
             internal final val c: kotlin.Int = 1
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean

compiler/testData/diagnostics/tests/classObjects/InnerClassClassObject.kt

@@ -2,16 +2,16 @@
 
 class A {
     inner class B {
-        <!DEFAULT_OBJECT_NOT_ALLOWED!>class object<!> { }
+        default <!DEFAULT_OBJECT_NOT_ALLOWED!>object<!> { }
     }
 }
 
 class B {
-    class object {
+    default object {
         class B {
-            class object {
+            default object {
                 class C {
-                    class object { }
+                    default object { }
                 }
             }
         }
@@ -20,6 +20,6 @@ class B {
 
 class C {
     class D {
-        class object { }
+        default object { }
     }
 }

compiler/testData/diagnostics/tests/classObjects/InnerClassClassObject.txt

@@ -12,7 +12,7 @@ internal final class A {
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-        internal class object Default {
+        internal default object Default {
             private constructor Default()
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -27,7 +27,7 @@ internal final class B {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-    internal class object Default {
+    internal default object Default {
         private constructor Default()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -39,7 +39,7 @@ internal final class B {
             public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-            internal class object Default {
+            internal default object Default {
                 private constructor Default()
                 public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
                 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -51,7 +51,7 @@ internal final class B {
                     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
                     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-                    internal class object Default {
+                    internal default object Default {
                         private constructor Default()
                         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
                         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -75,7 +75,7 @@ internal final class C {
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-        internal class object Default {
+        internal default object Default {
             private constructor Default()
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/classObjects/classObjectHeader.kt

@@ -4,6 +4,6 @@ open class ToResolve<SomeClass>(<!UNUSED_PARAMETER!>f<!> : (Int) -> Int)
 fun testFun(<!UNUSED_PARAMETER!>a<!> : Int) = 12
 
 class TestSome<P> {
-    class object : ToResolve<<!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>P<!>>({testFun(it)}) {
+    default object : ToResolve<<!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>P<!>>({testFun(it)}) {
     }
 }

compiler/testData/diagnostics/tests/classObjects/classObjectHeader.txt

@@ -9,7 +9,7 @@ package test {
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-        internal class object Default : test.ToResolve<P> {
+        internal default object Default : test.ToResolve<P> {
             private constructor Default()
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/classObjects/classObjectInLocalClass.kt

@@ -1,9 +1,9 @@
 fun test() {
     class A {
-        <!DEFAULT_OBJECT_NOT_ALLOWED!>class object<!> {}
+        default <!DEFAULT_OBJECT_NOT_ALLOWED!>object<!> {}
     }
 
     object {
-        <!DEFAULT_OBJECT_NOT_ALLOWED!>class object<!> {}
+        default <!DEFAULT_OBJECT_NOT_ALLOWED!>object<!> {}
     }
 }

compiler/testData/diagnostics/tests/classObjects/classObjectRedeclaration.kt

@@ -3,11 +3,11 @@ package test
 class A {
     object <!REDECLARATION!>Default<!>
 
-    <!REDECLARATION!>class object<!>
+    default <!REDECLARATION!>object<!>
 }
 
 class B {
-    class object <!REDECLARATION!>Named<!>
+    default object <!REDECLARATION!>Named<!>
 
     object <!REDECLARATION!>Named<!>
 }
@@ -15,5 +15,5 @@ class B {
 class C {
     class <!REDECLARATION!>Named<!>
 
-    class object <!REDECLARATION!>Named<!>
+    default object <!REDECLARATION!>Named<!>
 }

compiler/testData/diagnostics/tests/classObjects/classObjectRedeclaration.txt

@@ -15,7 +15,7 @@ package test {
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
         }
 
-        internal class object Default {
+        internal default object Default {
             private constructor Default()
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -36,7 +36,7 @@ package test {
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
         }
 
-        internal class object Named {
+        internal default object Named {
             private constructor Named()
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -57,7 +57,7 @@ package test {
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
         }
 
-        internal class object Named {
+        internal default object Named {
             private constructor Named()
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/classObjects/importClassInClassObject.kt

@@ -3,7 +3,7 @@ package f
 import f.A.Default.B
 
 class A {
-    class object {
+    default object {
         class B
     }
 }

compiler/testData/diagnostics/tests/classObjects/importClassInClassObject.txt

@@ -9,7 +9,7 @@ package f {
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-        internal class object Default {
+        internal default object Default {
             private constructor Default()
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/classObjects/invisibleClassObjects.kt

@@ -2,25 +2,25 @@
 package a
 
 class A {
-    class object {
+    default object {
         fun foo() {}
     }
 }
 
 private class B {
-    class object {
+    default object {
         fun bar() {}
     }
 }
 
 class C {
-    private class object {
+    private default object {
         fun baz() {}
     }
 }
 
 private class D {
-    private class object {
+    private default object {
         fun quux() {}
     }
 }

compiler/testData/diagnostics/tests/classObjects/invisibleClassObjects.txt

@@ -8,7 +8,7 @@ package a {
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-        internal class object Default {
+        internal default object Default {
             private constructor Default()
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             internal final fun foo(): kotlin.Unit
@@ -23,7 +23,7 @@ package a {
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-        private class object Default {
+        private default object Default {
             private constructor Default()
             internal final fun bar(): kotlin.Unit
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -38,7 +38,7 @@ package a {
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-        private class object Default {
+        private default object Default {
             private constructor Default()
             internal final fun baz(): kotlin.Unit
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -53,7 +53,7 @@ package a {
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-        private class object Default {
+        private default object Default {
             private constructor Default()
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/classObjects/kt3866.kt

@@ -4,11 +4,11 @@ open class C {
 fun C.foo() {}
 
 open class X {
-    class object : C() {}
+    default object : C() {}
 }
 
 open class Y {
-    class object : C() {}
+    default object : C() {}
 }
 
 fun bar() {

compiler/testData/diagnostics/tests/classObjects/kt3866.txt

@@ -16,7 +16,7 @@ internal open class X {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-    internal class object Default : C {
+    internal default object Default : C {
         private constructor Default()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -30,7 +30,7 @@ internal open class Y {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-    internal class object Default : C {
+    internal default object Default : C {
         private constructor Default()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/classObjects/multipleDissallowedDefaultObjects.txt

@@ -12,21 +12,21 @@ internal final class A {
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-        internal class object A {
+        internal default object A {
             private constructor A()
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
         }
 
-        internal class object B {
+        internal default object B {
             private constructor B()
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
         }
 
-        internal class object C {
+        internal default object C {
             private constructor C()
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -41,21 +41,21 @@ internal object O {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-    internal class object A {
+    internal default object A {
         private constructor A()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
-    internal class object B {
+    internal default object B {
         private constructor B()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
-    internal class object C {
+    internal default object C {
         private constructor C()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/classObjects/nestedClassInPrivateClassObject.kt

@@ -1,8 +1,8 @@
 class A {
-    private class object {
+    private default object {
         class B {
             class C {
-                class object {
+                default object {
                     fun foo() {}
                 }
             }

compiler/testData/diagnostics/tests/classObjects/nestedClassInPrivateClassObject.txt

@@ -9,7 +9,7 @@ internal final class A {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-    private class object Default {
+    private default object Default {
         private constructor Default()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -27,7 +27,7 @@ internal final class A {
                 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
                 public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-                internal class object Default {
+                internal default object Default {
                     private constructor Default()
                     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
                     internal final fun foo(): kotlin.Unit

compiler/testData/diagnostics/tests/classObjects/resolveFunctionInsideClassObject.kt

@@ -3,7 +3,7 @@ package test
 class Test {
   fun test(): Int = 12
 
-  class object {
+  default object {
     val a = <!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>test()<!> // Check if resolver will be able to infer type of a variable
   }
 }

compiler/testData/diagnostics/tests/classObjects/resolveFunctionInsideClassObject.txt

@@ -9,7 +9,7 @@ package test {
         internal final fun test(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-        internal class object Default {
+        internal default object Default {
             private constructor Default()
             internal final val a: kotlin.Int
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean

compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.kt

@@ -247,7 +247,7 @@ class ForwardAccessToBackingField() { //kt-147
 }
 
 class ClassObject() {
-    class object {
+    default object {
         val x : Int
 
         {

compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.txt

@@ -49,7 +49,7 @@ package uninitialized_reassigned_variables {
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-        internal class object Default {
+        internal default object Default {
             private constructor Default()
             internal final val x: kotlin.Int
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean

compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.kt

@@ -10,7 +10,7 @@ enum class Direction {
 }
 
 class A {
-    class object {
+    default object {
 
     }
 }

compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.txt

@@ -12,7 +12,7 @@ package kt1185 {
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-        internal class object Default {
+        internal default object Default {
             private constructor Default()
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/dataFlowInfoTraversal/smartcasts/SmartcastsForStableIdentifiers.kt

@@ -13,7 +13,7 @@ object Obj {
 }
 
 class AClass() {
-    class object {
+    default object {
         val y : Any? = 2
     }
 }

compiler/testData/diagnostics/tests/dataFlowInfoTraversal/smartcasts/SmartcastsForStableIdentifiers.txt

@@ -11,7 +11,7 @@ package example {
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-        internal class object Default {
+        internal default object Default {
             private constructor Default()
             internal final val y: kotlin.Any? = 2
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean

compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.kt

@@ -3,10 +3,10 @@
 // KT-3464 Front-end shouldn't allow override modifier in class declaration
 
 <!ILLEGAL_MODIFIER!>override<!> class A {
-    <!ILLEGAL_MODIFIER!>override<!> class object {}
-    <!ILLEGAL_MODIFIER!>open<!> class object {}
-    <!ILLEGAL_MODIFIER!>abstract<!> class object {}
-    <!ILLEGAL_MODIFIER!>final<!> class object {}
+    <!ILLEGAL_MODIFIER!>override<!> default object {}
+    <!ILLEGAL_MODIFIER!>open<!> default object {}
+    <!ILLEGAL_MODIFIER!>abstract<!> default object {}
+    <!ILLEGAL_MODIFIER!>final<!> default object {}
 }
 
 <!ILLEGAL_MODIFIER!>override<!> object B1 {}

compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.txt

@@ -6,28 +6,28 @@ internal open class A {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-    internal class object Default {
+    internal default object Default {
         private constructor Default()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
-    internal class object Default {
+    internal default object Default {
         private constructor Default()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
-    internal class object Default {
+    internal default object Default {
         private constructor Default()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
-    internal class object Default {
+    internal default object Default {
         private constructor Default()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/delegatedProperty/defaultSetter.txt

@@ -1,4 +1,4 @@
-package 
+package
 
 internal var a: kotlin.Int
 

compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classObject.kt

@@ -1,5 +1,5 @@
 class C {
-    class object {
+    default object {
         <!CONFLICTING_JVM_DECLARATIONS!>val x<!> = 1
         <!CONFLICTING_JVM_DECLARATIONS!>fun getX()<!> = 1
     }

compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classObject.txt

@@ -6,7 +6,7 @@ internal final class C {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-    internal class object Default {
+    internal default object Default {
         private constructor Default()
         internal final val x: kotlin.Int = 1
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean

compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.kt

@@ -1,11 +1,11 @@
 class C {
-    <!REDECLARATION!>class object<!> {}
+    default <!REDECLARATION!>object<!> {}
 
     val <!REDECLARATION!>Default<!> = C
 }
 
 class D {
-    <!CONFLICTING_JVM_DECLARATIONS!>class object<!> {}
+    default <!CONFLICTING_JVM_DECLARATIONS!>object<!> {}
 
     <!CONFLICTING_JVM_DECLARATIONS!>val `OBJECT$`<!> = D
 }

compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.txt

@@ -7,7 +7,7 @@ internal final class C {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-    internal class object Default {
+    internal default object Default {
         private constructor Default()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -22,7 +22,7 @@ internal final class D {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-    internal class object Default {
+    internal default object Default {
         private constructor Default()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedField.kt

@@ -1,5 +1,5 @@
 class C {
-    class object {
+    default object {
         val X = 1
         <!CONFLICTING_JVM_DECLARATIONS!>val `X$1`<!> = 1
     }

compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedField.txt

@@ -7,7 +7,7 @@ internal final class C {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-    internal class object Default {
+    internal default object Default {
         private constructor Default()
         internal final val X: kotlin.Int = 1
         internal final val `X$1`: kotlin.Int = 1

compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.kt

@@ -1,5 +1,5 @@
 class C {
-    <!REDECLARATION!>class object<!> {
+    default <!REDECLARATION!>object<!> {
         val <!REDECLARATION!>Default<!> = this
     }
 
@@ -7,7 +7,7 @@ class C {
 }
 
 class D {
-    <!CONFLICTING_JVM_DECLARATIONS!>class object<!> {
+    default <!CONFLICTING_JVM_DECLARATIONS!>object<!> {
         <!CONFLICTING_JVM_DECLARATIONS!>val `OBJECT$`<!> = this
     }
 

compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.txt

@@ -7,7 +7,7 @@ internal final class C {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-    internal class object Default {
+    internal default object Default {
         private constructor Default()
         internal final val Default: C.Default
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -23,7 +23,7 @@ internal final class D {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-    internal class object Default {
+    internal default object Default {
         private constructor Default()
         internal final val `OBJECT$`: D.Default
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean

compiler/testData/diagnostics/tests/enum/classObjectInEnum.kt

@@ -1,7 +1,7 @@
 enum class E {
     ENTRY
 
-    class object {
+    default object {
         fun entry() = ENTRY
     }
 }

compiler/testData/diagnostics/tests/enum/classObjectInEnum.txt

@@ -21,7 +21,7 @@ internal final enum class E : kotlin.Enum<E> {
     public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-    internal class object Default {
+    internal default object Default {
         private constructor Default()
         internal final fun entry(): E
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean

compiler/testData/diagnostics/tests/enum/classObjectInEnumPrivate.kt

@@ -1,7 +1,7 @@
 enum class E {
     ENTRY
 
-    private class object
+    private default object
 }
 
 fun foo() = E.values()

compiler/testData/diagnostics/tests/enum/classObjectInEnumPrivate.txt

@@ -24,7 +24,7 @@ internal final enum class E : kotlin.Enum<E> {
     public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-    private class object Default {
+    private default object Default {
         private constructor Default()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/enum/enumEntryCannotHaveClassObject.kt

@@ -2,7 +2,7 @@ enum class E {
     FIRST
 
     SECOND {
-        <!DEFAULT_OBJECT_NOT_ALLOWED!>class object<!> {
+        default <!DEFAULT_OBJECT_NOT_ALLOWED!>object<!> {
             fun foo() = 42
         }
     }

compiler/testData/diagnostics/tests/enum/enumEntryCannotHaveClassObject.txt

@@ -22,7 +22,7 @@ internal final enum class E : kotlin.Enum<E> {
         public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-        public class object Default {
+        public default object Default {
             private constructor Default()
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             internal final fun foo(): kotlin.Int

compiler/testData/diagnostics/tests/enum/enumModifier.kt

@@ -1,7 +1,7 @@
 enum class B {}
 
 class A {
-   <!ILLEGAL_ENUM_ANNOTATION!>enum<!> class object {}
+   <!ILLEGAL_ENUM_ANNOTATION!>enum<!> default object {}
 }
 
 <!ILLEGAL_ENUM_ANNOTATION!>enum<!> object O {}

compiler/testData/diagnostics/tests/enum/enumModifier.txt

@@ -10,7 +10,7 @@ internal final class A {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-    internal class object Default {
+    internal default object Default {
         private constructor Default()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/enum/inner/existingClassObject.kt

@@ -3,14 +3,14 @@ class A {
         ENTRY
     }
     
-    class object {
+    default object {
     }
 }
 
 
 
 class B {
-    class object {
+    default object {
     }
     
     enum class E {

compiler/testData/diagnostics/tests/enum/inner/existingClassObject.txt

@@ -6,7 +6,7 @@ internal final class A {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-    internal class object Default {
+    internal default object Default {
         private constructor Default()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -44,7 +44,7 @@ internal final class B {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-    internal class object Default {
+    internal default object Default {
         private constructor Default()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/enum/inner/insideClassObject.kt

@@ -1,5 +1,5 @@
 class A {
-    class object {
+    default object {
         enum class E {
             ENTRY
         }

compiler/testData/diagnostics/tests/enum/inner/insideClassObject.txt

@@ -6,7 +6,7 @@ internal final class A {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-    internal class object Default {
+    internal default object Default {
         private constructor Default()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/enum/inner/redeclarationInClassObject.kt

@@ -3,7 +3,7 @@ class A {
         ENTRY
     }
     
-    class object {
+    default object {
         enum class <!REDECLARATION!>E<!> {
             ENTRY2
         }

compiler/testData/diagnostics/tests/enum/inner/redeclarationInClassObject.txt

@@ -6,7 +6,7 @@ internal final class A {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-    internal class object Default {
+    internal default object Default {
         private constructor Default()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/enum/inner/twoEnumsInClassObjectAndInnerClass.kt

@@ -1,5 +1,5 @@
 class A {
-    class object {
+    default object {
         enum class E { ENTRY }  // OK
     }
     

compiler/testData/diagnostics/tests/enum/inner/twoEnumsInClassObjectAndInnerClass.txt

@@ -37,7 +37,7 @@ internal final class A {
         }
     }
 
-    internal class object Default {
+    internal default object Default {
         private constructor Default()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.kt

@@ -6,7 +6,7 @@ enum class E {
     ANOTHER
 
     class Nested {
-        class object {
+        default object {
             fun foo() = 42
         }
     }

compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.txt

@@ -45,7 +45,7 @@ package foo {
             public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-            internal class object Default {
+            internal default object Default {
                 private constructor Default()
                 public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
                 internal final fun foo(): kotlin.Int

compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.kt

@@ -1,7 +1,7 @@
 enum class E {
     ENTRY
 
-    class object {
+    default object {
         fun foo(): E = ENTRY
         fun bar(): Array<E> = values()
         fun baz(): E = valueOf("ENTRY")

compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.txt

@@ -29,7 +29,7 @@ internal final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     internal final fun zab(): E
 
-    internal class object Default {
+    internal default object Default {
         private constructor Default()
         internal final val valuez: kotlin.Array<E>
         internal final fun bar(): kotlin.Array<E>

compiler/testData/diagnostics/tests/extensions/classObject.kt

@@ -1,7 +1,7 @@
 trait Tr
 
-class A { class object }
-class B { class object : Tr }
+class A { default object }
+class B { default object : Tr }
 
 fun Any.f1() {}
 fun Any?.f2() {}

compiler/testData/diagnostics/tests/extensions/classObject.txt

@@ -13,7 +13,7 @@ internal final class A {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-    internal class object Default {
+    internal default object Default {
         private constructor Default()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -27,7 +27,7 @@ internal final class B {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-    internal class object Default : Tr {
+    internal default object Default : Tr {
         private constructor Default()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/extensions/extensionMemberInClassObject.kt

@@ -5,7 +5,7 @@ trait JPAEntityClass<D> {
 }
 
 class Foo {
-    class object : JPAEntityClass<Foo>
+    default object : JPAEntityClass<Foo>
 }
 
 fun main(args: Array<String>) {

compiler/testData/diagnostics/tests/extensions/extensionMemberInClassObject.txt

@@ -9,7 +9,7 @@ internal final class Foo {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-    internal class object Default : JPAEntityClass<Foo> {
+    internal default object Default : JPAEntityClass<Foo> {
         private constructor Default()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/extensions/kt3470.kt

@@ -1,5 +1,5 @@
 class A {
-    class object {
+    default object {
         fun foo() = toString()
     }
 }

compiler/testData/diagnostics/tests/extensions/kt3470.txt

@@ -8,7 +8,7 @@ internal final class A {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-    internal class object Default {
+    internal default object Default {
         private constructor Default()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         internal final fun foo(): kotlin.String

compiler/testData/diagnostics/tests/imports/Imports.kt

@@ -5,12 +5,12 @@ import b.B        //class
 import b.foo      //function
 import b.ext      //extension function
 import b.value    //property
-import b.C.Default.<!CANNOT_BE_IMPORTED!>bar<!>    //function from class object
-import b.C.Default.<!CANNOT_BE_IMPORTED!>cValue<!> //property from class object
+import b.C.Default.<!CANNOT_BE_IMPORTED!>bar<!>    //function from default object
+import b.C.Default.<!CANNOT_BE_IMPORTED!>cValue<!> //property from default object
 import b.<!CANNOT_IMPORT_FROM_ELEMENT!>constant<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>fff<!>     //function from val
 import b.<!CANNOT_IMPORT_FROM_ELEMENT!>constant<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>dValue<!>  //property from val
 import b.constant
-import b.E.Default.<!CANNOT_BE_IMPORTED!>f<!>      //val from class object
+import b.E.Default.<!CANNOT_BE_IMPORTED!>f<!>      //val from default object
 import <!UNRESOLVED_REFERENCE!>smth<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>illegal<!>
 import b.C.<!UNRESOLVED_REFERENCE!>smth<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>illegal<!>
 import b.<!CANNOT_IMPORT_FROM_ELEMENT!>bar<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>smth<!>
@@ -42,7 +42,7 @@ fun B.ext() {}
 val value = 0
 
 class C() {
-    class object {
+    default object {
         fun bar() {}
         val cValue = 1
     }
@@ -56,7 +56,7 @@ class D() {
 val constant = D()
 
 class E() {
-    class object {
+    default object {
         val f = F()
     }
 }
@@ -92,7 +92,7 @@ val b : B = B()
 val c : B = C
 
 class A() {
-    class object {
+    default object {
         open class B() {}
         object C : B() {}
     }

compiler/testData/diagnostics/tests/imports/Imports.txt

@@ -24,7 +24,7 @@ package b {
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-        internal class object Default {
+        internal default object Default {
             private constructor Default()
             internal final val cValue: kotlin.Int = 1
             internal final fun bar(): kotlin.Unit
@@ -49,7 +49,7 @@ package b {
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-        internal class object Default {
+        internal default object Default {
             private constructor Default()
             internal final val f: b.F
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -90,7 +90,7 @@ package d {
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-        internal class object Default {
+        internal default object Default {
             private constructor Default()
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/imports/StarImportFromObject.kt

@@ -30,7 +30,7 @@ class A {
         object J
     }
 
-    class object CO {
+    default object CO {
         object H
     }
 }

compiler/testData/diagnostics/tests/imports/StarImportFromObject.txt

@@ -22,7 +22,7 @@ package a {
             }
         }
 
-        internal class object CO {
+        internal default object CO {
             private constructor CO()
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/inference/regressions/kt702.kt

@@ -5,7 +5,7 @@ package a
 fun getJavaClass<T>() : java.lang.Class<T> { <!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
 
 public class Throwables() {
-    class object {
+    default object {
         public fun propagateIfInstanceOf<X : Throwable?>(throwable : Throwable?, declaredType : Class<X<!BASE_WITH_NULLABLE_UPPER_BOUND!>?<!>>?) : Unit {
             if (((throwable != null) && declaredType?.isInstance(throwable)!!))
             {

compiler/testData/diagnostics/tests/inference/regressions/kt702.txt

@@ -9,7 +9,7 @@ package a {
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-        public class object Default {
+        public default object Default {
             private constructor Default()
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/inner/classesInClassObjectHeader.kt

@@ -1,6 +1,6 @@
 class Test {
     [`InnerAnnotation`InnerAnnotation]
-    class object : StaticClass(), <!INACCESSIBLE_OUTER_CLASS_EXPRESSION!><!MANY_CLASSES_IN_SUPERTYPE_LIST!>InnerClass<!>()<!> {
+    default object : StaticClass(), <!INACCESSIBLE_OUTER_CLASS_EXPRESSION!><!MANY_CLASSES_IN_SUPERTYPE_LIST!>InnerClass<!>()<!> {
 
     }
 

compiler/testData/diagnostics/tests/inner/classesInClassObjectHeader.txt

@@ -6,7 +6,7 @@ internal final class Test {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-    Test.InnerAnnotation() Test.InnerAnnotation() internal class object Default : Test.StaticClass, Test.InnerClass {
+    Test.InnerAnnotation() Test.InnerAnnotation() internal default object Default : Test.StaticClass, Test.InnerClass {
         private constructor Default()
         public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/inner/deepInnerClass.kt

@@ -4,7 +4,7 @@ class A<T> {
     class B {
         fun test() {
             class C<W>() : P<W, <!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>T<!>> {
-                <!DEFAULT_OBJECT_NOT_ALLOWED!>class object<!> : P<<!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>W<!>, <!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>T<!>> {
+                default <!DEFAULT_OBJECT_NOT_ALLOWED!>object<!> : P<<!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>W<!>, <!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>T<!>> {
                 }
 
                 inner class D : P<W, <!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>T<!>>

compiler/testData/diagnostics/tests/inner/extensionLambdaInsideNestedClass.kt

@@ -7,7 +7,7 @@ object A {
 }
 
 class B {
-    class object {
+    default object {
         class LoginFormPage() : Request({
             val <!UNUSED_VARIABLE!>failed<!> = session.get("LOGIN_FAILED")
         })

compiler/testData/diagnostics/tests/inner/extensionLambdaInsideNestedClass.txt

@@ -45,7 +45,7 @@ package f {
             }
         }
 
-        internal class object Default {
+        internal default object Default {
             private constructor Default()
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/inner/illegalModifier.kt

@@ -11,7 +11,7 @@ class D {
     <!ILLEGAL_MODIFIER!>inner<!> object G
     <!ILLEGAL_MODIFIER!>inner<!> enum class R
     <!ILLEGAL_MODIFIER!>inner<!> annotation class S
-    <!ILLEGAL_MODIFIER!>inner<!> class object
+    <!ILLEGAL_MODIFIER!>inner<!> default object
 }
 
 enum class H {
@@ -31,7 +31,7 @@ object N {
 }
 
 class P {
-    class object {
+    default object {
         <!INNER_CLASS_IN_OBJECT!>inner<!> class Q
     }
 }

compiler/testData/diagnostics/tests/inner/illegalModifier.txt

@@ -30,7 +30,7 @@ internal final class D {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-    internal class object Default {
+    internal default object Default {
         private constructor Default()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -150,7 +150,7 @@ internal final class P {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-    internal class object Default {
+    internal default object Default {
         private constructor Default()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/inner/innerClassesInStaticParameters.kt

@@ -1,5 +1,5 @@
 class Test {
-    class object {
+    default object {
         fun test(<!UNUSED_PARAMETER!>t<!>: TestInner) = 42
     }
 

compiler/testData/diagnostics/tests/inner/innerClassesInStaticParameters.txt

@@ -6,7 +6,7 @@ internal final class Test {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-    internal class object Default {
+    internal default object Default {
         private constructor Default()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/inner/innerErrorForClassObjects.kt

@@ -1,11 +1,11 @@
 open class SomeClass<T>
 class TestSome<P> {
-    class object : SomeClass<<!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>P<!>>() {
+    default object : SomeClass<<!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>P<!>>() {
     }
 }
 
 class Test {
-    class object : <!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>InnerClass()<!> {
+    default object : <!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>InnerClass()<!> {
         val a = object: <!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>InnerClass()<!> {
         }
 

compiler/testData/diagnostics/tests/inner/innerErrorForClassObjects.txt

@@ -15,7 +15,7 @@ internal final class Test {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-    internal class object Default : Test.InnerClass {
+    internal default object Default : Test.InnerClass {
         private constructor Default()
         internal final val a: Test.InnerClass
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -38,7 +38,7 @@ internal final class TestSome</*0*/ P> {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-    internal class object Default : SomeClass<P> {
+    internal default object Default : SomeClass<P> {
         private constructor Default()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.kt

@@ -1,24 +1,24 @@
 trait N { fun foo() = 1 }
 
 class WithClassObject {
-    class object {}
+    default object {}
 
     class Nested()
-    class NestedWithClassObject { class object : N }
+    class NestedWithClassObject { default object : N }
     enum class NestedEnum { A }
     object NestedObj : N { fun invoke() = 1 }
 }
 
 class WithoutClassObject {
     class Nested()
-    class NestedWithClassObject { class object : N }
+    class NestedWithClassObject { default object : N }
     enum class NestedEnum { A }
     object NestedObj : N { fun invoke() = 1 }
 }
 
 object Obj {
     class Nested()
-    class NestedWithClassObject { class object : N }
+    class NestedWithClassObject { default object : N }
     enum class NestedEnum { A }
     object NestedObj : N { fun invoke() = 1 }
 }

compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.txt

@@ -61,7 +61,7 @@ internal object Obj {
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-        internal class object Default : N {
+        internal default object Default : N {
             private constructor Default()
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             internal open override /*1*/ /*fake_override*/ fun foo(): kotlin.Int
@@ -77,7 +77,7 @@ internal final class WithClassObject {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-    internal class object Default {
+    internal default object Default {
         private constructor Default()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -130,7 +130,7 @@ internal final class WithClassObject {
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-        internal class object Default : N {
+        internal default object Default : N {
             private constructor Default()
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             internal open override /*1*/ /*fake_override*/ fun foo(): kotlin.Int
@@ -192,7 +192,7 @@ internal final class WithoutClassObject {
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-        internal class object Default : N {
+        internal default object Default : N {
             private constructor Default()
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             internal open override /*1*/ /*fake_override*/ fun foo(): kotlin.Int

compiler/testData/diagnostics/tests/inner/qualifiedExpression/classObjectOfNestedClass.kt

@@ -1,11 +1,11 @@
 class Outer {
     class Nested {
-        class object {
+        default object {
             fun foo() = 42
         }
     }
     
-    class object {
+    default object {
         fun bar() = 239
     }
 }

compiler/testData/diagnostics/tests/inner/qualifiedExpression/classObjectOfNestedClass.txt

@@ -9,7 +9,7 @@ internal final class Outer {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-    internal class object Default {
+    internal default object Default {
         private constructor Default()
         internal final fun bar(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -23,7 +23,7 @@ internal final class Outer {
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-        internal class object Default {
+        internal default object Default {
             private constructor Default()
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             internal final fun foo(): kotlin.Int

compiler/testData/diagnostics/tests/inner/resolvePackageClassInObjects.kt

@@ -1,7 +1,7 @@
 open class PackageTest
 
 class MoreTest() {
-    class object: PackageTest() {
+    default object: PackageTest() {
 
     }
 

compiler/testData/diagnostics/tests/inner/resolvePackageClassInObjects.txt

@@ -6,7 +6,7 @@ internal final class MoreTest {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-    internal class object Default : PackageTest {
+    internal default object Default : PackageTest {
         private constructor Default()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int