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

j2k/testData/KotlinApi.kt

@@ -6,7 +6,7 @@ public open class KotlinClass(public var field: Int) {
 
     public open fun foo(mutableCollection: MutableCollection<String>, nullableCollection: Collection<Int>?): MutableList<Any> = arrayListOf()
 
-    class object {
+    default object {
         public fun staticFun(p: Int): Int = p
         public var staticVar: Int = 1
         public var staticProperty: Int

j2k/testData/fileOrElement/annotations/annotationInterface3.kt

@@ -6,7 +6,7 @@ annotation class Anon(public val value: String) {
         B
     }
 
-    class object {
+    default object {
 
         public val field: E = E.A
     }
@@ -14,7 +14,7 @@ annotation class Anon(public val value: String) {
 
 Anon("a")
 trait I {
-    class object {
+    default object {
         public val e: Anon.E = Anon.field
     }
 }

j2k/testData/fileOrElement/anonymousBlock/oneStaticAnonBlock.kt

@@ -1,5 +1,5 @@
 class Test {
-    class object {
+    default object {
         var str: String
         {
             str = "Ola"

j2k/testData/fileOrElement/callChainExpression/libraryFieldCall.kt

@@ -1,6 +1,6 @@
 // ERROR: Property must be initialized or be abstract
 class Library {
-    class object {
+    default object {
         val ourOut: java.io.PrintStream
     }
 }

j2k/testData/fileOrElement/callChainExpression/libraryMethodCall.kt

@@ -1,5 +1,5 @@
 class Library {
-    class object {
+    default object {
         fun call() {
         }
 

j2k/testData/fileOrElement/class/ClassShadowing.kt

@@ -1,7 +1,7 @@
 package test
 
 public class Short {
-    class object {
+    default object {
         public fun valueOf(value: String): Short {
             return Short()
         }
@@ -9,7 +9,7 @@ public class Short {
 }
 
 class Test {
-    class object {
+    default object {
         public fun test() {
             test.Short.valueOf("1")
             test.Short.valueOf("1")

j2k/testData/fileOrElement/class/oneStaticFieldOneNonStatic.kt

@@ -3,7 +3,7 @@ class S {
         return true
     }
 
-    class object {
+    default object {
         var myI = 10
     }
 }

j2k/testData/fileOrElement/class/oneStaticMethod.kt

@@ -1,5 +1,5 @@
 class S {
-    class object {
+    default object {
         fun staticF(): Boolean {
             return true
         }

j2k/testData/fileOrElement/class/oneStaticMethodOneNonStatic.kt

@@ -3,7 +3,7 @@ class S {
         return true
     }
 
-    class object {
+    default object {
         fun sI(): Int {
             return 1
         }

j2k/testData/fileOrElement/class/twoStaticMethod.kt

@@ -1,5 +1,5 @@
 class S {
-    class object {
+    default object {
         fun sB(): Boolean {
             return true
         }

j2k/testData/fileOrElement/classExpression/primitivesAndArrays.kt

@@ -1,5 +1,5 @@
 public class A {
-    class object {
+    default object {
         public fun main(args: Array<String>) {
             System.out.println(Void.TYPE)
             System.out.println(Integer.TYPE)

j2k/testData/fileOrElement/comments/comments2.kt

@@ -21,7 +21,7 @@ class A {
     protected /*it's protected*/ fun foo(c: Char) {
     }
 
-    class object {
+    default object {
 
         public /*it's public*//*and static*//*and final*/ val C: Int = 1
     }

j2k/testData/fileOrElement/constructors/allCallsPrimary.kt

@@ -3,7 +3,7 @@ package pack
 class C(arg1: Int, arg2: Int = 0, arg3: Int = 0)
 
 public class User {
-    class object {
+    default object {
         public fun main() {
             val c1 = C(100, 100, 100)
             val c2 = C(100, 100)

j2k/testData/fileOrElement/constructors/allCallsPrimary2.kt

@@ -23,7 +23,7 @@ class C(val myArg1: Int) {
 }
 
 public class User {
-    class object {
+    default object {
         public fun main() {
             val c1 = C(100, 100, 100)
             val c2 = C(100, 100)

j2k/testData/fileOrElement/constructors/chain.kt

@@ -13,7 +13,7 @@ fun C(arg1: Int): C {
 class C(arg1: Int, arg2: Int, arg3: Int)
 
 public class User {
-    class object {
+    default object {
         public fun main() {
             val c1 = C(1, 2, 3)
             val c2 = C(5, 6)

j2k/testData/fileOrElement/constructors/customerBuilder.kt

@@ -34,7 +34,7 @@ class CustomerBuilder {
 }
 
 public class User {
-    class object {
+    default object {
         public fun main() {
             val customer = CustomerBuilder().WithFirstName("Homer").WithLastName("Simpson").Build()
             System.out.println(customer.firstName)

j2k/testData/fileOrElement/constructors/genericIdentifier.kt

@@ -25,7 +25,7 @@ public class Identifier<T>(public val name: T, private val myHasDollar: Boolean)
 }
 
 public class User {
-    class object {
+    default object {
         public fun main() {
             val i1 = Identifier("name", false, true)
             val i2 = Identifier<String>("name", false)

j2k/testData/fileOrElement/constructors/identifier.kt

@@ -25,7 +25,7 @@ public class Identifier(public val name: String, private val myHasDollar: Boolea
 }
 
 public class User {
-    class object {
+    default object {
         public fun main() {
             val i1 = Identifier("name", false, true)
             val i2 = Identifier("name", false)

j2k/testData/fileOrElement/constructors/methodCallInFactoryFun.kt

@@ -12,7 +12,7 @@ class C(private val arg1: Int, private val arg2: Int, private val arg3: Int) {
         return p
     }
 
-    class object {
+    default object {
         private fun staticFoo(p: Int): Int {
             return p
         }

j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults.kt

@@ -1,7 +1,7 @@
 class A(nested: A.Nested = A.Nested(A.Nested.FIELD)) {
 
     class Nested(p: Int) {
-        class object {
+        default object {
 
             public val FIELD: Int = 0
         }

j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults2.kt

@@ -4,7 +4,7 @@ import A.Nested
 class A(nested: Nested = Nested(Nested.FIELD)) {
 
     class Nested(p: Int) {
-        class object {
+        default object {
 
             public val FIELD: Int = 0
         }

j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults3.kt

@@ -6,7 +6,7 @@ import pack.A.Nested
 class A(nested: Nested = Nested(Nested.FIELD)) {
 
     class Nested(p: Int) {
-        class object {
+        default object {
 
             public val FIELD: Int = 0
         }

j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults4.kt

@@ -6,7 +6,7 @@ import pack.A.*
 class A(nested: Nested = Nested(Nested.FIELD)) {
 
     class Nested(p: Int) {
-        class object {
+        default object {
 
             public val FIELD: Int = 0
         }

j2k/testData/fileOrElement/constructors/nestedClassNameInSuperParameters.kt

@@ -1,7 +1,7 @@
 open class Base(nested: Base.Nested) {
 
     class Nested(p: Int) {
-        class object {
+        default object {
 
             public val FIELD: Int = 0
         }

j2k/testData/fileOrElement/constructors/noPrimary.kt

@@ -17,7 +17,7 @@ fun C(arg: Int): C {
 class C
 
 public class User {
-    class object {
+    default object {
         public fun main() {
             val c1 = C(1, 2, 3)
             val c2 = C(5, 6)

j2k/testData/fileOrElement/constructors/parameterModification.kt

@@ -20,7 +20,7 @@ class C(arg1: Int, arg2: Int = 0, arg3: Int = 0) {
 }
 
 public class User {
-    class object {
+    default object {
         public fun main() {
             val c1 = C(100, 100, 100)
             val c2 = C(100, 100)

j2k/testData/fileOrElement/constructors/secondaryConstructorsInNestedClass.kt

@@ -1,5 +1,5 @@
 class Outer {
-    class object {
+    default object {
 
         private fun Nested1(a: Int): Nested1 {
             return Nested1()

j2k/testData/fileOrElement/constructors/staticFieldRefInFactoryFun.kt

@@ -7,7 +7,7 @@ fun C(p: Int): C {
 }
 
 class C {
-    class object {
+    default object {
         private val staticField1 = 0
         private val staticField2 = 0
     }

j2k/testData/fileOrElement/constructors/withManyDefaultParams.kt

@@ -20,7 +20,7 @@ public class Test(private val myName: String) {
     protected var f: Short = 0
     protected var g: Char = ' '
 
-    class object {
+    default object {
 
         fun foo(n: String): String {
             return ""
@@ -29,7 +29,7 @@ public class Test(private val myName: String) {
 }
 
 public class User {
-    class object {
+    default object {
         public fun main() {
             val t = Test("name")
         }

j2k/testData/fileOrElement/field/conversion.kt

@@ -5,7 +5,7 @@ class A {
         i = 10
     }
 
-    class object {
+    default object {
 
         fun getByte(): Byte {
             return 0

j2k/testData/fileOrElement/formatting/staticAndNonStaticMembersWithComments.kt

@@ -17,7 +17,7 @@ class F {
     fun f4() {
     }
 
-    class object {
+    default object {
 
         //c1
 

j2k/testData/fileOrElement/formatting/staticMembersWithComments.kt

@@ -1,5 +1,5 @@
 class F {
-    class object {
+    default object {
 
         //c1
 

j2k/testData/fileOrElement/function/main.kt

@@ -1,4 +1,4 @@
-class object {
+default object {
     public fun main(args: Array<String>) {
     }
 }

j2k/testData/fileOrElement/function/main2.kt

@@ -1,5 +1,5 @@
 public class A {
-    class object {
+    default object {
         public fun main(args: Array<String>) {
         }
     }

j2k/testData/fileOrElement/function/mainAndNullabilitySetting.kt

@@ -1,6 +1,6 @@
 // !forceNotNullTypes: false
 public class A {
-    class object {
+    default object {
         public fun main(args: Array<String>) {
         }
     }

j2k/testData/fileOrElement/issues/arrayLength.kt

@@ -1,5 +1,5 @@
 class Test {
-    class object {
+    default object {
         public fun foo(args: Array<String>): Int {
             return args.size
         }

j2k/testData/fileOrElement/issues/doNotQualifyStatic.kt

@@ -6,7 +6,7 @@ class Outer {
         }
     }
 
-    class object {
+    default object {
         public var o: Any? = Object()
     }
 }

j2k/testData/fileOrElement/issues/kt-1074.kt

@@ -1,7 +1,7 @@
 package demo
 
 class Test {
-    class object {
+    default object {
         fun subListRangeCheck(fromIndex: Int, toIndex: Int, size: Int) {
             if (fromIndex < 0)
                 throw IndexOutOfBoundsException("fromIndex = " + fromIndex)

j2k/testData/fileOrElement/issues/kt-638.kt

@@ -25,7 +25,7 @@ public class Identifier<T>(public val name: T, private val myHasDollar: Boolean)
 }
 
 public class User {
-    class object {
+    default object {
         public fun main(args: Array<String>) {
             val i1 = Identifier("name", false, true)
             val i2 = Identifier<String>("name", false)

j2k/testData/fileOrElement/issues/kt-807.kt

@@ -5,7 +5,7 @@
 import java.io.*
 
 class FileRead {
-    class object {
+    default object {
         public fun main(args: Array<String>) {
             try {
                 val fstream = FileInputStream()

j2k/testData/fileOrElement/issues/kt-809-string.kt

@@ -5,7 +5,7 @@ class Container {
 }
 
 class One {
-    class object {
+    default object {
         var myContainer = Container()
     }
 }

j2k/testData/fileOrElement/issues/kt-809.kt

@@ -5,7 +5,7 @@ class Container {
 }
 
 class One {
-    class object {
+    default object {
         var myContainer = Container()
     }
 }

j2k/testData/fileOrElement/issues/kt-820-field.kt

@@ -5,7 +5,7 @@ class Container {
 }
 
 class One {
-    class object {
+    default object {
         var myContainer = Container()
     }
 }

j2k/testData/fileOrElement/issues/kt-820-string.kt

@@ -1,5 +1,5 @@
 class Test {
-    class object {
+    default object {
         public fun toFileSystemSafeName(name: String): String {
             val size = name.length()
             return name

j2k/testData/fileOrElement/issues/kt-820.kt

@@ -5,7 +5,7 @@ class Container {
 }
 
 class One {
-    class object {
+    default object {
         var myContainer = Container()
     }
 }

j2k/testData/fileOrElement/issues/kt-824-isDir.kt

@@ -6,7 +6,7 @@ import java.io.File
  * User: ignatov
  */
 public class Test {
-    class object {
+    default object {
         public fun isDir(parent: File?): Boolean {
             if (parent == null || !parent.exists()) {
                 return false

j2k/testData/fileOrElement/issues/kt-824.kt

@@ -5,7 +5,7 @@ class Container {
 }
 
 class One {
-    class object {
+    default object {
         var myContainer = Container()
     }
 }

j2k/testData/fileOrElement/issues/kt-837.kt

@@ -8,7 +8,7 @@ public class Language(protected var code: String) : Serializable {
         return other.toString() == this.toString()
     }
 
-    class object {
+    default object {
         public var ENGLISH: Language = Language("en")
         public var SWEDISH: Language = Language("sv")
         private val serialVersionUID = -2442762969929206780

j2k/testData/fileOrElement/issues/kt-871.kt

@@ -1,7 +1,7 @@
 package demo
 
 class Program {
-    class object {
+    default object {
         public fun main(args: Array<String>) {
             System.out.println("Halo!")
         }

j2k/testData/fileOrElement/issues/kt-879.kt

@@ -1,5 +1,5 @@
 class Test {
-    class object {
+    default object {
         public fun getInt(i: Int): Int {
             when (i) {
                 0 -> return 0

j2k/testData/fileOrElement/methodCallExpression/vararg1.kt

@@ -1,7 +1,7 @@
 import java.lang.reflect.Constructor
 
 class X {
-    class object {
+    default object {
         throws(javaClass<Exception>())
         fun <T> foo(constructor: Constructor<T>, args1: Array<Any>, args2: Array<Any>) {
             constructor.newInstance(*args1)

j2k/testData/fileOrElement/nullability/MethodResultInitializesNullableField.kt

@@ -2,7 +2,7 @@
 class C {
     private val string = getString()
 
-    class object {
+    default object {
 
         fun getString(): String? {
             return x()

j2k/testData/fileOrElement/staticMembers/PrivateStaticMembers.kt

@@ -5,7 +5,7 @@ class A {
         privateStatic2()
     }
 
-    class object {
+    default object {
         private val s = "abc"
 
         private fun privateStatic1() {

j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods2.kt

@@ -4,7 +4,7 @@ class A {
         privateStatic2()
     }
 
-    class object {
+    default object {
 
         public fun publicStatic() {
             privateStatic1()

j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods3.kt

@@ -9,7 +9,7 @@ class A {
         privateStatic2()
     }
 
-    class object {
+    default object {
 
         private fun privateStatic1() {
         }

j2k/testData/fileOrElement/switch/comlicatedFallDown.kt

@@ -1,7 +1,7 @@
 package demo
 
 public class SwitchDemo {
-    class object {
+    default object {
         public fun print(o: Any) {
             System.out.println(o)
         }

j2k/testData/fileOrElement/switch/emptySwitch.kt

@@ -1,5 +1,5 @@
 public class NonDefault {
-    class object {
+    default object {
         public fun main(args: Array<String>) {
 
             val value = 3

j2k/testData/fileOrElement/switch/fallDown.kt

@@ -1,7 +1,7 @@
 package switch_demo
 
 public class SwitchDemo {
-    class object {
+    default object {
         public fun main(args: Array<String>) {
             val month = 8
             val monthString: String

j2k/testData/fileOrElement/switch/fallDownWithBlocks.kt

@@ -1,5 +1,5 @@
 public class C {
-    class object {
+    default object {
         public fun main(args: Array<String>) {
             when (args.size) {
                 1 -> {

j2k/testData/fileOrElement/switch/kt-539.kt

@@ -1,7 +1,7 @@
 package switch_demo
 
 public class SwitchDemo {
-    class object {
+    default object {
         public fun main(args: Array<String>) {
 
             val month = 8

j2k/testData/fileOrElement/switch/nondefault.kt

@@ -1,5 +1,5 @@
 public class NonDefault {
-    class object {
+    default object {
         public fun main(args: Array<String>) {
 
             val value = 3

j2k/testData/fileOrElement/trait/interfaceWithFields.kt

@@ -1,5 +1,5 @@
 trait INode {
-    class object {
+    default object {
         public val IN: String = "in"
         public val AT: String = "@"
         public val COMMA_WITH_SPACE: String = COMMA + SPACE

j2k/testData/fileOrElement/trait/interfaceWithStaticFields.kt

@@ -1,5 +1,5 @@
 public trait INode {
-    class object {
+    default object {
         public val IN: String = "in"
         public val AT: String = "@"
         public val COMMA_WITH_SPACE: String = COMMA + SPACE

j2k/testData/fileOrElement/typeParameters/rawTypeCast.kt

@@ -2,7 +2,7 @@
 import java.util.*
 
 class A {
-    class object {
+    default object {
         public fun foo(): Map<String, String> {
             val props = Properties()
             return HashMap(props as Map<Any, Any>)