From 108a1f872cedee157b1eadb59ca93bc21fdc01eb Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Wed, 25 Mar 2015 19:20:06 +0300
Subject: [PATCH] J2K: use of new syntax for class intialization blocks

---
 .idea/compiler.xml                                              | 2 ++
 j2k/src/org/jetbrains/kotlin/j2k/ast/Initializer.kt             | 2 +-
 j2k/testData/fileOrElement/annotations/jetbrainsNotNull.kt      | 2 +-
 j2k/testData/fileOrElement/annotations/jetbrainsNullable.kt     | 2 +-
 j2k/testData/fileOrElement/anonymousBlock/oneAnonBlock.kt       | 2 +-
 j2k/testData/fileOrElement/anonymousBlock/oneStaticAnonBlock.kt | 2 +-
 j2k/testData/fileOrElement/comments/commentsForConstructors.kt  | 2 +-
 j2k/testData/fileOrElement/constructors/allCallsPrimary2.kt     | 2 +-
 j2k/testData/fileOrElement/constructors/customerBuilder.kt      | 2 +-
 .../fileOrElement/constructors/fieldsInitializedFromParams2.kt  | 2 +-
 .../fileOrElement/constructors/fieldsInitializedFromParams3.kt  | 2 +-
 .../fileOrElement/constructors/fieldsInitializedFromParams4.kt  | 2 +-
 .../fileOrElement/constructors/fieldsInitializedFromParams5.kt  | 2 +-
 .../fileOrElement/constructors/fieldsInitializedFromParams6.kt  | 2 +-
 .../fileOrElement/constructors/fieldsInitializedFromParams7.kt  | 2 +-
 .../fileOrElement/constructors/parameterModification.kt         | 2 +-
 j2k/testData/fileOrElement/dropAccessors/DataClass.kt           | 2 +-
 .../fileOrElement/dropAccessors/DataClassWithMutableField.kt    | 2 +-
 .../dropAccessors/DifferentFieldNameAndSuperClass.kt            | 2 +-
 .../fileOrElement/dropAccessors/FieldUsagesInFactoryMethods.kt  | 2 +-
 j2k/testData/fileOrElement/field/valOrVar.kt                    | 2 +-
 j2k/testData/fileOrElement/issues/kt-963.kt                     | 2 +-
 .../fileOrElement/mutableCollections/FunctionReturnValue2.kt    | 2 +-
 .../fileOrElement/nullability/FieldComparedWithNull4.kt         | 2 +-
 j2k/testData/fileOrElement/objectLiteral/MyFrame.kt             | 2 +-
 .../fileOrElement/rawGenerics/kt-540-rawGenericClass.kt         | 2 +-
 26 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 8e36395a283..13d6655cce8 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -3,7 +3,9 @@
   <component name="CompilerConfiguration">
     <option name="DEFAULT_COMPILER" value="Javac" />
     <excludeFromCompile>
+      <directory url="file://$PROJECT_DIR$/core/reflection" includeSubdirectories="true" />
       <directory url="file://$PROJECT_DIR$/core/reflection.jvm" includeSubdirectories="true" />
+      <directory url="file://$PROJECT_DIR$/core/reflection.stub.jvm" includeSubdirectories="true" />
     </excludeFromCompile>
     <resourceExtensions />
     <wildcardResourcePatterns>
diff --git a/j2k/src/org/jetbrains/kotlin/j2k/ast/Initializer.kt b/j2k/src/org/jetbrains/kotlin/j2k/ast/Initializer.kt
index 966f0cc0d89..970f1ce4d00 100644
--- a/j2k/src/org/jetbrains/kotlin/j2k/ast/Initializer.kt
+++ b/j2k/src/org/jetbrains/kotlin/j2k/ast/Initializer.kt
@@ -20,7 +20,7 @@ import org.jetbrains.kotlin.j2k.*
 
 class Initializer(val body: DeferredElement<Block>, modifiers: Modifiers) : Member(Annotations.Empty, modifiers) {
     override fun generateCode(builder: CodeBuilder) {
-        builder.append(body)
+        builder append "init" append body
     }
 
     override val isEmpty: Boolean
diff --git a/j2k/testData/fileOrElement/annotations/jetbrainsNotNull.kt b/j2k/testData/fileOrElement/annotations/jetbrainsNotNull.kt
index cbe76060c10..cc1737f26fe 100644
--- a/j2k/testData/fileOrElement/annotations/jetbrainsNotNull.kt
+++ b/j2k/testData/fileOrElement/annotations/jetbrainsNotNull.kt
@@ -5,7 +5,7 @@ package test
 public class Test(str: String) {
     var myStr = "String2"
 
-    {
+    init {
         myStr = str
     }
 
diff --git a/j2k/testData/fileOrElement/annotations/jetbrainsNullable.kt b/j2k/testData/fileOrElement/annotations/jetbrainsNullable.kt
index a7a6cca0837..552033c5fa5 100644
--- a/j2k/testData/fileOrElement/annotations/jetbrainsNullable.kt
+++ b/j2k/testData/fileOrElement/annotations/jetbrainsNullable.kt
@@ -4,7 +4,7 @@ package test
 public class Test(str: String?) {
     var myStr: String? = "String2"
 
-    {
+    init {
         myStr = str
     }
 
diff --git a/j2k/testData/fileOrElement/anonymousBlock/oneAnonBlock.kt b/j2k/testData/fileOrElement/anonymousBlock/oneAnonBlock.kt
index e951e1d01ce..b83a57d0a86 100644
--- a/j2k/testData/fileOrElement/anonymousBlock/oneAnonBlock.kt
+++ b/j2k/testData/fileOrElement/anonymousBlock/oneAnonBlock.kt
@@ -1,7 +1,7 @@
 class Test {
     var str: String
 
-    {
+    init {
         str = "Ola"
     }
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/anonymousBlock/oneStaticAnonBlock.kt b/j2k/testData/fileOrElement/anonymousBlock/oneStaticAnonBlock.kt
index e57e183e974..b2e922c2dc1 100644
--- a/j2k/testData/fileOrElement/anonymousBlock/oneStaticAnonBlock.kt
+++ b/j2k/testData/fileOrElement/anonymousBlock/oneStaticAnonBlock.kt
@@ -2,7 +2,7 @@ class Test {
     companion object {
         var str: String
 
-        {
+        init {
             str = "Ola"
         }
     }
diff --git a/j2k/testData/fileOrElement/comments/commentsForConstructors.kt b/j2k/testData/fileOrElement/comments/commentsForConstructors.kt
index d98cbe5bb37..3a60fe10ed9 100644
--- a/j2k/testData/fileOrElement/comments/commentsForConstructors.kt
+++ b/j2k/testData/fileOrElement/comments/commentsForConstructors.kt
@@ -2,7 +2,7 @@ class A// this is a primary constructor
 (p: Int = 1) {
     private val v: Int
 
-    {
+    init {
         v = 1
     } // end of primary constructor body
 
diff --git a/j2k/testData/fileOrElement/constructors/allCallsPrimary2.kt b/j2k/testData/fileOrElement/constructors/allCallsPrimary2.kt
index 47c1a61e91c..026465a8b4c 100644
--- a/j2k/testData/fileOrElement/constructors/allCallsPrimary2.kt
+++ b/j2k/testData/fileOrElement/constructors/allCallsPrimary2.kt
@@ -12,7 +12,7 @@ class C(val myArg1: Int) {
         myArg3 = 0
     }
 
-    {
+    init {
         myArg2 = 0
         myArg3 = 0
     }
diff --git a/j2k/testData/fileOrElement/constructors/customerBuilder.kt b/j2k/testData/fileOrElement/constructors/customerBuilder.kt
index 435c86ab6cb..681b249fda7 100644
--- a/j2k/testData/fileOrElement/constructors/customerBuilder.kt
+++ b/j2k/testData/fileOrElement/constructors/customerBuilder.kt
@@ -2,7 +2,7 @@ package org.test.customer
 
 class Customer(public val firstName: String, public val lastName: String) {
 
-    {
+    init {
         doSmthBefore()
         doSmthAfter()
     }
diff --git a/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams2.kt b/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams2.kt
index 7b21dbdabfd..22ed76cc004 100644
--- a/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams2.kt
+++ b/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams2.kt
@@ -1,6 +1,6 @@
 class C(private val field: Int) {
 
-    {
+    init {
         System.out.println(field)
     }
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams3.kt b/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams3.kt
index ba454c0c790..83c5e9b7c47 100644
--- a/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams3.kt
+++ b/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams3.kt
@@ -1,7 +1,7 @@
 class C(p: Int) {
     private val p: Int
 
-    {
+    init {
         var p = p
         this.p = p
         System.out.println(p++)
diff --git a/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams4.kt b/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams4.kt
index fc1e3d24954..c9106dd9f28 100644
--- a/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams4.kt
+++ b/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams4.kt
@@ -1,7 +1,7 @@
 class C(p: Int, c: C) {
     public var p: Int = 0
 
-    {
+    init {
         c.p = p
     }
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams5.kt b/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams5.kt
index d95fe990af6..fd7c4fdf957 100644
--- a/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams5.kt
+++ b/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams5.kt
@@ -1,7 +1,7 @@
 class C(p: Int) {
     public var p: Int = 0
 
-    {
+    init {
         this.p = 0
         if (p > 0) {
             this.p = p
diff --git a/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams6.kt b/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams6.kt
index 9ecfa31aab1..c36238cca74 100644
--- a/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams6.kt
+++ b/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams6.kt
@@ -1,7 +1,7 @@
 class C(x: String) {
     public var x: Any
 
-    {
+    init {
         this.x = x
     }
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams7.kt b/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams7.kt
index c6939ccf941..7c85b86d000 100644
--- a/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams7.kt
+++ b/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams7.kt
@@ -2,7 +2,7 @@
 class C(x: Any, b: Boolean) {
     public var x: Any
 
-    {
+    init {
         if (b) {
             this.x = x
         }
diff --git a/j2k/testData/fileOrElement/constructors/parameterModification.kt b/j2k/testData/fileOrElement/constructors/parameterModification.kt
index a50e9eb69ce..f213acc1957 100644
--- a/j2k/testData/fileOrElement/constructors/parameterModification.kt
+++ b/j2k/testData/fileOrElement/constructors/parameterModification.kt
@@ -2,7 +2,7 @@
 class C(arg1: Int, arg2: Int = 0, arg3: Int = 0) {
     private val field: Int
 
-    {
+    init {
         var arg1 = arg1
         var arg3 = arg3
         arg1++
diff --git a/j2k/testData/fileOrElement/dropAccessors/DataClass.kt b/j2k/testData/fileOrElement/dropAccessors/DataClass.kt
index e0065bd2328..59002f18e52 100644
--- a/j2k/testData/fileOrElement/dropAccessors/DataClass.kt
+++ b/j2k/testData/fileOrElement/dropAccessors/DataClass.kt
@@ -1,6 +1,6 @@
 public class Test(public var id: String?, public val name: String, public val age: Int) {
 
-    {
+    init {
         System.out.println(age)
     }
 }
diff --git a/j2k/testData/fileOrElement/dropAccessors/DataClassWithMutableField.kt b/j2k/testData/fileOrElement/dropAccessors/DataClassWithMutableField.kt
index de84f032ed6..8d306ec747e 100644
--- a/j2k/testData/fileOrElement/dropAccessors/DataClassWithMutableField.kt
+++ b/j2k/testData/fileOrElement/dropAccessors/DataClassWithMutableField.kt
@@ -2,7 +2,7 @@ public class Test(count: Int) {
     public var count: Int = 0
         private set
 
-    {
+    init {
         this.count = count
     }
 
diff --git a/j2k/testData/fileOrElement/dropAccessors/DifferentFieldNameAndSuperClass.kt b/j2k/testData/fileOrElement/dropAccessors/DifferentFieldNameAndSuperClass.kt
index 1bb5fa56d99..13af7b76eae 100644
--- a/j2k/testData/fileOrElement/dropAccessors/DifferentFieldNameAndSuperClass.kt
+++ b/j2k/testData/fileOrElement/dropAccessors/DifferentFieldNameAndSuperClass.kt
@@ -2,7 +2,7 @@ public open class Base(x: Int) {
     public var x: Int = 42
         protected set
 
-    {
+    init {
         this.x = x
     }
 }
diff --git a/j2k/testData/fileOrElement/dropAccessors/FieldUsagesInFactoryMethods.kt b/j2k/testData/fileOrElement/dropAccessors/FieldUsagesInFactoryMethods.kt
index a64fdbd8ac1..25b7775fd07 100644
--- a/j2k/testData/fileOrElement/dropAccessors/FieldUsagesInFactoryMethods.kt
+++ b/j2k/testData/fileOrElement/dropAccessors/FieldUsagesInFactoryMethods.kt
@@ -12,7 +12,7 @@ class C(val arg1: Int) {
         arg3 = 0
     }
 
-    {
+    init {
         arg2 = 0
         arg3 = 0
     }
diff --git a/j2k/testData/fileOrElement/field/valOrVar.kt b/j2k/testData/fileOrElement/field/valOrVar.kt
index aaefd687367..ff02eb56354 100644
--- a/j2k/testData/fileOrElement/field/valOrVar.kt
+++ b/j2k/testData/fileOrElement/field/valOrVar.kt
@@ -9,7 +9,7 @@ class A(private val field6: Int, private val field8: Int, a: A) {
     private var field10: Int = 0
     private var field11: Int = 0
 
-    {
+    init {
         field7 = 10
         this.field9 = 10
         if (field6 > 0) {
diff --git a/j2k/testData/fileOrElement/issues/kt-963.kt b/j2k/testData/fileOrElement/issues/kt-963.kt
index 722879d209a..c70038edd49 100644
--- a/j2k/testData/fileOrElement/issues/kt-963.kt
+++ b/j2k/testData/fileOrElement/issues/kt-963.kt
@@ -2,7 +2,7 @@
 package demo
 
 class C(a: Int) {
-    {
+    init {
         abc = a * 2
     }
 
diff --git a/j2k/testData/fileOrElement/mutableCollections/FunctionReturnValue2.kt b/j2k/testData/fileOrElement/mutableCollections/FunctionReturnValue2.kt
index db4651bd387..0999d4bc881 100644
--- a/j2k/testData/fileOrElement/mutableCollections/FunctionReturnValue2.kt
+++ b/j2k/testData/fileOrElement/mutableCollections/FunctionReturnValue2.kt
@@ -3,7 +3,7 @@ import java.util.*
 class A {
     private val collection: MutableCollection<String>
 
-    {
+    init {
         collection = createCollection()
     }
 
diff --git a/j2k/testData/fileOrElement/nullability/FieldComparedWithNull4.kt b/j2k/testData/fileOrElement/nullability/FieldComparedWithNull4.kt
index 8dd1506df50..c0f060a28e6 100644
--- a/j2k/testData/fileOrElement/nullability/FieldComparedWithNull4.kt
+++ b/j2k/testData/fileOrElement/nullability/FieldComparedWithNull4.kt
@@ -1,6 +1,6 @@
 class C(private val s: String?) {
 
-    {
+    init {
         if (s == null) {
             System.out.print("null")
         }
diff --git a/j2k/testData/fileOrElement/objectLiteral/MyFrame.kt b/j2k/testData/fileOrElement/objectLiteral/MyFrame.kt
index 8673e4a165f..6551e902250 100644
--- a/j2k/testData/fileOrElement/objectLiteral/MyFrame.kt
+++ b/j2k/testData/fileOrElement/objectLiteral/MyFrame.kt
@@ -15,7 +15,7 @@ open class Frame {
 }
 
 public class Client : Frame() {
-    {
+    init {
         val a = object : WindowAdapter() {
             override fun windowClosing() {
             }
diff --git a/j2k/testData/fileOrElement/rawGenerics/kt-540-rawGenericClass.kt b/j2k/testData/fileOrElement/rawGenerics/kt-540-rawGenericClass.kt
index 5d797cb6420..ee01e001cdc 100644
--- a/j2k/testData/fileOrElement/rawGenerics/kt-540-rawGenericClass.kt
+++ b/j2k/testData/fileOrElement/rawGenerics/kt-540-rawGenericClass.kt
@@ -1,7 +1,7 @@
 package demo
 
 class Collection<E>(e: E) {
-    {
+    init {
         System.out.println(e)
     }
 }