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/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.kt

@@ -3,7 +3,7 @@ package test
 annotation class Anno
 
 class Class {
-    class object {
+    default object {
         [Anno] var property: Int = 42
     }
 }

compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.txt

@@ -7,7 +7,7 @@ internal final annotation class Anno : kotlin.Annotation {
 internal final class Class {
     /*primary*/ public constructor Class()
 
-    internal class object Default {
+    internal default object Default {
         /*primary*/ private constructor Default()
         test.Anno() internal final var property: kotlin.Int
             internal final fun <get-property>(): kotlin.Int

compiler/testData/loadJava/compiledKotlin/annotations/classes/AnnotationInClassObject.kt

@@ -1,7 +1,7 @@
 package test
 
 class A {
-    class object {
+    default object {
         annotation class Anno1
 
         class B {

compiler/testData/loadJava/compiledKotlin/annotations/classes/AnnotationInClassObject.txt

@@ -3,7 +3,7 @@ package test
 internal final class A {
     /*primary*/ public constructor A()
 
-    internal class object Default {
+    internal default object Default {
         /*primary*/ private constructor Default()
 
         internal final annotation class Anno1 : kotlin.Annotation {

compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassInClassObject.kt

@@ -3,7 +3,7 @@ package test
 annotation class Anno
 
 class Class {
-    class object {
+    default object {
         Anno class Nested
     }
 }

compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassInClassObject.txt

@@ -7,7 +7,7 @@ internal final annotation class Anno : kotlin.Annotation {
 internal final class Class {
     /*primary*/ public constructor Class()
 
-    internal class object Default {
+    internal default object Default {
         /*primary*/ private constructor Default()
 
         test.Anno() internal final class Nested {

compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObject.kt

@@ -3,5 +3,5 @@ package test
 annotation class Anno
 
 class Class {
-    Anno class object
+    Anno default object
 }

compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObject.txt

@@ -7,7 +7,7 @@ internal final annotation class Anno : kotlin.Annotation {
 internal final class Class {
     /*primary*/ public constructor Class()
 
-    test.Anno() internal class object Default {
+    test.Anno() internal default object Default {
         /*primary*/ private constructor Default()
     }
 }

compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObjectInStaticNestedClass.kt

@@ -3,7 +3,7 @@ package test
 
 class A {
     class B {
-        class object {
+        default object {
             val TEST = 1
         }
     }

compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObjectInStaticNestedClass.txt

@@ -6,7 +6,7 @@ internal final class A {
     internal final class B {
         /*primary*/ public constructor B()
 
-        internal class object Default {
+        internal default object Default {
             /*primary*/ private constructor Default()
             internal final val TEST: kotlin.Int = 1
                 internal final fun <get-TEST>(): kotlin.Int

compiler/testData/loadJava/compiledKotlin/annotations/classes/Deprecated.kt

@@ -6,5 +6,5 @@ deprecated("Class") class Class {
 
     deprecated("Inner") inner class Inner
 
-    deprecated("class object") class object
+    deprecated("default object") default object
 }

compiler/testData/loadJava/compiledKotlin/annotations/classes/Deprecated.txt

@@ -3,7 +3,7 @@ package test
 kotlin.deprecated(value = "Class": kotlin.String) internal final class Class {
     /*primary*/ public constructor Class()
 
-    kotlin.deprecated(value = "class object": kotlin.String) internal class object Default {
+    kotlin.deprecated(value = "default object": kotlin.String) internal default object Default {
         /*primary*/ private constructor Default()
     }
 

compiler/testData/loadJava/compiledKotlin/annotations/classes/EnumArgument.kt

@@ -10,5 +10,5 @@ Anno(ElementType.METHOD) class Class {
     
     Anno(ElementType.TYPE) class Nested
 
-    Anno(ElementType.ANNOTATION_TYPE) class object
+    Anno(ElementType.ANNOTATION_TYPE) default object
 }

compiler/testData/loadJava/compiledKotlin/annotations/classes/EnumArgument.txt

@@ -9,7 +9,7 @@ internal final annotation class Anno : kotlin.Annotation {
 test.Anno(t = ElementType.METHOD: java.lang.annotation.ElementType) internal final class Class {
     /*primary*/ public constructor Class()
 
-    test.Anno(t = ElementType.ANNOTATION_TYPE: java.lang.annotation.ElementType) internal class object Default {
+    test.Anno(t = ElementType.ANNOTATION_TYPE: java.lang.annotation.ElementType) internal default object Default {
         /*primary*/ private constructor Default()
     }
 

compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.kt

@@ -3,7 +3,7 @@ package test
 annotation class Anno
 
 class Class {
-    class object {
+    default object {
         [Anno] val property: Int
             get() = 42
     }

compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.txt

@@ -7,7 +7,7 @@ internal final annotation class Anno : kotlin.Annotation {
 internal final class Class {
     /*primary*/ public constructor Class()
 
-    internal class object Default {
+    internal default object Default {
         /*primary*/ private constructor Default()
         test.Anno() internal final val property: kotlin.Int
             internal final fun <get-property>(): kotlin.Int

compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.kt

@@ -3,7 +3,7 @@ package test
 annotation class Anno
 
 trait Trait {
-    class object {
+    default object {
         [Anno] val property: Int
             get() = 42
     }

compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.txt

@@ -6,7 +6,7 @@ internal final annotation class Anno : kotlin.Annotation {
 
 internal trait Trait {
 
-    internal class object Default {
+    internal default object Default {
         /*primary*/ private constructor Default()
         test.Anno() internal final val property: kotlin.Int
             internal final fun <get-property>(): kotlin.Int

compiler/testData/loadJava/compiledKotlin/class/ClassMemberConflict.kt

@@ -2,7 +2,7 @@
 package test
 
 class ConstructorTypeParamClassObjectTypeConflict<test> {
-    class object {
+    default object {
         trait test
     }
 
@@ -10,7 +10,7 @@ class ConstructorTypeParamClassObjectTypeConflict<test> {
 }
 
 class ConstructorTypeParamClassObjectConflict<test> {
-    class object {
+    default object {
         val test = 12
     }
 
@@ -18,7 +18,7 @@ class ConstructorTypeParamClassObjectConflict<test> {
 }
 
 class TestConstructorParamClassObjectConflict(test: String) {
-    class object {
+    default object {
         val test = 12
     }
 
@@ -27,7 +27,7 @@ class TestConstructorParamClassObjectConflict(test: String) {
 
 
 class TestConstructorValClassObjectConflict(val test: String) {
-    class object {
+    default object {
         val test = 12
     }
 
@@ -35,7 +35,7 @@ class TestConstructorValClassObjectConflict(val test: String) {
 }
 
 class TestClassObjectAndClassConflict {
-    class object {
+    default object {
         val bla = 12
     }
 

compiler/testData/loadJava/compiledKotlin/class/ClassMemberConflict.txt

@@ -5,7 +5,7 @@ internal final class ConstructorTypeParamClassObjectConflict</*0*/ test> {
     internal final val some: kotlin.Int = 12
         internal final fun <get-some>(): kotlin.Int
 
-    internal class object Default {
+    internal default object Default {
         /*primary*/ private constructor Default()
         internal final val test: kotlin.Int = 12
             internal final fun <get-test>(): kotlin.Int
@@ -17,7 +17,7 @@ internal final class ConstructorTypeParamClassObjectTypeConflict</*0*/ test> {
     internal final val some: test?
         internal final fun <get-some>(): test?
 
-    internal class object Default {
+    internal default object Default {
         /*primary*/ private constructor Default()
 
         internal trait test {
@@ -32,7 +32,7 @@ internal final class TestClassObjectAndClassConflict {
     internal final val some: kotlin.String = "More"
         internal final fun <get-some>(): kotlin.String
 
-    internal class object Default {
+    internal default object Default {
         /*primary*/ private constructor Default()
         internal final val bla: kotlin.Int = 12
             internal final fun <get-bla>(): kotlin.Int
@@ -44,7 +44,7 @@ internal final class TestConstructorParamClassObjectConflict {
     internal final val some: kotlin.String
         internal final fun <get-some>(): kotlin.String
 
-    internal class object Default {
+    internal default object Default {
         /*primary*/ private constructor Default()
         internal final val test: kotlin.Int = 12
             internal final fun <get-test>(): kotlin.Int
@@ -58,7 +58,7 @@ internal final class TestConstructorValClassObjectConflict {
     internal final val test: kotlin.String
         internal final fun <get-test>(): kotlin.String
 
-    internal class object Default {
+    internal default object Default {
         /*primary*/ private constructor Default()
         internal final val test: kotlin.Int = 12
             internal final fun <get-test>(): kotlin.Int

compiler/testData/loadJava/compiledKotlin/class/NamedObjectInClassObject.kt

@@ -2,7 +2,7 @@
 package test
 
 public class Outer {
-    public class object {
+    public default object {
         public object Obj {
             public val v: String = "val"
             public fun f(): String = "fun"

compiler/testData/loadJava/compiledKotlin/class/NamedObjectInClassObject.txt

@@ -3,7 +3,7 @@ package test
 public final class Outer {
     /*primary*/ public constructor Outer()
 
-    public class object Default {
+    public default object Default {
         /*primary*/ private constructor Default()
 
         public object Obj {

compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVal.kt

@@ -2,7 +2,7 @@
 package test
 
 class ClassObjectDeclaresProperty {
-    class object {
+    default object {
         val i = 1
     }
 }

compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVal.txt

@@ -3,7 +3,7 @@ package test
 internal final class ClassObjectDeclaresProperty {
     /*primary*/ public constructor ClassObjectDeclaresProperty()
 
-    internal class object Default {
+    internal default object Default {
         /*primary*/ private constructor Default()
         internal final val i: kotlin.Int = 1
             internal final fun <get-i>(): kotlin.Int

compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVar.kt

@@ -2,7 +2,7 @@
 package test
 
 class ClassObjectDeclaresProperty {
-    class object {
+    default object {
         var s = ""
     }
 }

compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVar.txt

@@ -3,7 +3,7 @@ package test
 internal final class ClassObjectDeclaresProperty {
     /*primary*/ public constructor ClassObjectDeclaresProperty()
 
-    internal class object Default {
+    internal default object Default {
         /*primary*/ private constructor Default()
         internal final var s: kotlin.String
             internal final fun <get-s>(): kotlin.String

compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDefaultVisibility.kt

@@ -1,14 +1,14 @@
 package test
 
 public class Pub {
-    class object {}
+    default object {}
 }
 
 private class Pri {
-    class object {}
+    default object {}
 }
 
 class Int {
-    class object {}
+    default object {}
 }
 

compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDefaultVisibility.txt

@@ -3,7 +3,7 @@ package test
 internal final class Int {
     /*primary*/ public constructor Int()
 
-    internal class object Default {
+    internal default object Default {
         /*primary*/ private constructor Default()
     }
 }
@@ -11,7 +11,7 @@ internal final class Int {
 private final class Pri {
     /*primary*/ public constructor Pri()
 
-    private class object Default {
+    private default object Default {
         /*primary*/ private constructor Default()
     }
 }
@@ -19,7 +19,7 @@ private final class Pri {
 public final class Pub {
     /*primary*/ public constructor Pub()
 
-    public class object Default {
+    public default object Default {
         /*primary*/ private constructor Default()
     }
 }

compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExplicitVisibility.kt

@@ -1,37 +1,37 @@
 package test
 
 public class PubPri {
-    private class object {}
+    private default object {}
 }
 
 public class PubInt {
-    internal class object {}
+    internal default object {}
 }
 
 public class PubPub {
-    public class object {}
+    public default object {}
 }
 
 internal class IntPri {
-    private class object {}
+    private default object {}
 }
 
 internal class IntInt {
-    internal class object {}
+    internal default object {}
 }
 
 internal class IntPub {
-    public class object {}
+    public default object {}
 }
 
 private class PriPri {
-    private class object {}
+    private default object {}
 }
 
 private class PriInt {
-    internal class object {}
+    internal default object {}
 }
 
 private class PriPub {
-    public class object {}
+    public default object {}
 }

compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExplicitVisibility.txt

@@ -3,7 +3,7 @@ package test
 internal final class IntInt {
     /*primary*/ public constructor IntInt()
 
-    internal class object Default {
+    internal default object Default {
         /*primary*/ private constructor Default()
     }
 }
@@ -11,7 +11,7 @@ internal final class IntInt {
 internal final class IntPri {
     /*primary*/ public constructor IntPri()
 
-    private class object Default {
+    private default object Default {
         /*primary*/ private constructor Default()
     }
 }
@@ -19,7 +19,7 @@ internal final class IntPri {
 internal final class IntPub {
     /*primary*/ public constructor IntPub()
 
-    public class object Default {
+    public default object Default {
         /*primary*/ private constructor Default()
     }
 }
@@ -27,7 +27,7 @@ internal final class IntPub {
 private final class PriInt {
     /*primary*/ public constructor PriInt()
 
-    internal class object Default {
+    internal default object Default {
         /*primary*/ private constructor Default()
     }
 }
@@ -35,7 +35,7 @@ private final class PriInt {
 private final class PriPri {
     /*primary*/ public constructor PriPri()
 
-    private class object Default {
+    private default object Default {
         /*primary*/ private constructor Default()
     }
 }
@@ -43,7 +43,7 @@ private final class PriPri {
 private final class PriPub {
     /*primary*/ public constructor PriPub()
 
-    public class object Default {
+    public default object Default {
         /*primary*/ private constructor Default()
     }
 }
@@ -51,7 +51,7 @@ private final class PriPub {
 public final class PubInt {
     /*primary*/ public constructor PubInt()
 
-    internal class object Default {
+    internal default object Default {
         /*primary*/ private constructor Default()
     }
 }
@@ -59,7 +59,7 @@ public final class PubInt {
 public final class PubPri {
     /*primary*/ public constructor PubPri()
 
-    private class object Default {
+    private default object Default {
         /*primary*/ private constructor Default()
     }
 }
@@ -67,7 +67,7 @@ public final class PubPri {
 public final class PubPub {
     /*primary*/ public constructor PubPub()
 
-    public class object Default {
+    public default object Default {
         /*primary*/ private constructor Default()
     }
 }

compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTrait.kt

@@ -3,6 +3,6 @@ package test
 trait Bbb
 
 class ClassObjectextendsTrait {
-    class object : Bbb {
+    default object : Bbb {
     }
 }

compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTrait.txt

@@ -6,7 +6,7 @@ internal trait Bbb {
 internal final class ClassObjectextendsTrait {
     /*primary*/ public constructor ClassObjectextendsTrait()
 
-    internal class object Default : test.Bbb {
+    internal default object Default : test.Bbb {
         /*primary*/ private constructor Default()
     }
 }

compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTraitWithTP.kt

@@ -3,6 +3,6 @@ package test
 trait Bbb<P>
 
 class ClassObjectExtendsTraitWithTP {
-    class object : Bbb<String> {
+    default object : Bbb<String> {
     }
 }

compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTraitWithTP.txt

@@ -6,7 +6,7 @@ internal trait Bbb</*0*/ P> {
 internal final class ClassObjectExtendsTraitWithTP {
     /*primary*/ public constructor ClassObjectExtendsTraitWithTP()
 
-    internal class object Default : test.Bbb<kotlin.String> {
+    internal default object Default : test.Bbb<kotlin.String> {
         /*primary*/ private constructor Default()
     }
 }

compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectPropertyInClass.kt

@@ -2,7 +2,7 @@
 package test
 
 class A {
-  class object {
+  default object {
     val some = 1
   }
 

compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectPropertyInClass.txt

@@ -5,7 +5,7 @@ internal final class A {
     internal final val other: kotlin.Int = 1
         internal final fun <get-other>(): kotlin.Int
 
-    internal class object Default {
+    internal default object Default {
         /*primary*/ private constructor Default()
         internal final val some: kotlin.Int = 1
             internal final fun <get-some>(): kotlin.Int

compiler/testData/loadJava/compiledKotlin/classObject/Delegation.kt

@@ -7,5 +7,5 @@ trait T {
 class A : T {
     override fun foo(): Int = 42
 
-    class object : T by A()
+    default object : T by A()
 }

compiler/testData/loadJava/compiledKotlin/classObject/Delegation.txt

@@ -4,7 +4,7 @@ internal final class A : test.T {
     /*primary*/ public constructor A()
     internal open override /*1*/ fun foo(): kotlin.Int
 
-    internal class object Default : test.T {
+    internal default object Default : test.T {
         /*primary*/ private constructor Default()
         internal open override /*1*/ /*delegation*/ fun foo(): kotlin.Int
     }

compiler/testData/loadJava/compiledKotlin/classObject/InnerClassInClassObject.kt

@@ -2,7 +2,7 @@
 package test
 
 class TestFirst {
-  class object {
+  default object {
     fun testing(a: InnerClass) = 45
     fun testing(a: NotInnerClass) = 45
   }

compiler/testData/loadJava/compiledKotlin/classObject/InnerClassInClassObject.txt

@@ -3,7 +3,7 @@ package test
 internal final class TestFirst {
     /*primary*/ public constructor TestFirst()
 
-    internal class object Default {
+    internal default object Default {
         /*primary*/ private constructor Default()
         internal final fun testing(/*0*/ a: test.TestFirst.InnerClass): kotlin.Int
         internal final fun testing(/*0*/ a: test.TestFirst.NotInnerClass): kotlin.Int

compiler/testData/loadJava/compiledKotlin/classObject/NamedClassObject.kt

@@ -1,7 +1,7 @@
 package test
 
 class NamedClassObject {
-    class object Named {
+    default object Named {
         fun f(): Int = 1
     }
 }

compiler/testData/loadJava/compiledKotlin/classObject/NamedClassObject.txt

@@ -3,7 +3,7 @@ package test
 internal final class NamedClassObject {
     /*primary*/ public constructor NamedClassObject()
 
-    internal class object Named {
+    internal default object Named {
         /*primary*/ private constructor Named()
         internal final fun f(): kotlin.Int
     }

compiler/testData/loadJava/compiledKotlin/classObject/SimpleClassObject.kt

@@ -1,6 +1,6 @@
 package test
 
 class SimpleClassObject() {
-    class object {
+    default object {
     }
 }

compiler/testData/loadJava/compiledKotlin/classObject/SimpleClassObject.txt

@@ -3,7 +3,7 @@ package test
 internal final class SimpleClassObject {
     /*primary*/ public constructor SimpleClassObject()
 
-    internal class object Default {
+    internal default object Default {
         /*primary*/ private constructor Default()
     }
 }

compiler/testData/loadJava/compiledKotlin/classObject/classObjectInClassStaticFields.kt

@@ -3,7 +3,7 @@ package test
 
 class Test {
 
-    class object {
+    default object {
 
         public val prop1 : Int = 10
 

compiler/testData/loadJava/compiledKotlin/classObject/classObjectInClassStaticFields.txt

@@ -3,7 +3,7 @@ package test
 internal final class Test {
     /*primary*/ public constructor Test()
 
-    internal class object Default {
+    internal default object Default {
         /*primary*/ private constructor Default()
         public final val prop1: kotlin.Int = 10
             public final fun <get-prop1>(): kotlin.Int

compiler/testData/loadJava/compiledKotlin/classObject/classObjectInTraitStaticFields.kt

@@ -3,7 +3,7 @@ package test
 
 trait Test {
 
-    class object {
+    default object {
 
         public val prop1 : Int = 10
 

compiler/testData/loadJava/compiledKotlin/classObject/classObjectInTraitStaticFields.txt

@@ -2,7 +2,7 @@ package test
 
 internal trait Test {
 
-    internal class object Default {
+    internal default object Default {
         /*primary*/ private constructor Default()
         public final val prop1: kotlin.Int = 10
             public final fun <get-prop1>(): kotlin.Int

compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.kt

@@ -1,7 +1,7 @@
 package test
 
 class A {
-    class object { }
+    default object { }
     enum class E {
         ENTRY
     }

compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.txt

@@ -3,7 +3,7 @@ package test
 internal final class A {
     /*primary*/ public constructor A()
 
-    internal class object Default {
+    internal default object Default {
         /*primary*/ private constructor Default()
     }
 

compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassObject.kt

@@ -1,6 +1,6 @@
 package test
 
 trait TheTrait {
-  class object {
+  default object {
   }
 }

compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassObject.txt

@@ -2,7 +2,7 @@ package test
 
 internal trait TheTrait {
 
-    internal class object Default {
+    internal default object Default {
         /*primary*/ private constructor Default()
     }
 }

compiler/testData/loadJava/compiledKotlin/fromLoadJava/classObjectAnnotation.kt

@@ -1,7 +1,7 @@
 package test
 
 class Some {
-  TestAnnotation class object {
+  TestAnnotation default object {
     annotation class TestAnnotation
   }
 }

compiler/testData/loadJava/compiledKotlin/fromLoadJava/classObjectAnnotation.txt

@@ -3,7 +3,7 @@ package test
 internal final class Some {
     /*primary*/ public constructor Some()
 
-    test.Some.Default.TestAnnotation() internal class object Default {
+    test.Some.Default.TestAnnotation() internal default object Default {
         /*primary*/ private constructor Default()
 
         internal final annotation class TestAnnotation : kotlin.Annotation {