KT-599 Initialize fields without initializers

src/org/jetbrains/jet/j2k/Converter.java

@@ -215,7 +215,7 @@ public class Converter {
   }
 
   @NotNull
-  private static String getDefaultInitializer(@NotNull Field f) {
+  public static String getDefaultInitializer(@NotNull Field f) {
     if (f.getType().isNullable())
       return "null";
     else {

src/org/jetbrains/jet/j2k/ast/Field.java

@@ -7,6 +7,8 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 
+import static org.jetbrains.jet.j2k.Converter.getDefaultInitializer;
+
 /**
  * @author ignatov
  */
@@ -65,7 +67,7 @@ public class Field extends Member {
     String modifier = modifiersToKotlin();
 
     if (myInitializer.isEmpty())
-      return modifier + myIdentifier.toKotlin() + SPACE + COLON + SPACE + myType.toKotlin();
+      return modifier + myIdentifier.toKotlin() + SPACE + COLON + SPACE + myType.toKotlin() + SPACE + EQUAL + SPACE + getDefaultInitializer(this);
 
     return modifier + myIdentifier.toKotlin() + SPACE + COLON + SPACE + myType.toKotlin() + SPACE +
       EQUAL + SPACE + myInitializer.toKotlin();

testData/ast/anonymousBlock/file/oneAnonBlock.kt

@@ -1,5 +1,5 @@
 open class Test() {
-var str : String?
+var str : String? = null
 {
 str = "Ola"
 }

testData/ast/anonymousBlock/file/oneStaticAnonBlock.kt

@@ -1,5 +1,5 @@
 open class Test() {
-var str : String?
+var str : String? = null
 class object {
 {
 str = "Ola"

testData/ast/callChainExpression/file/libraryFieldCall.kt

@@ -1,6 +1,6 @@
 open class Library() {
 class object {
-val ourOut : java.io.PrintStream?
+val ourOut : java.io.PrintStream? = null
 }
 }
 open class User() {

testData/ast/callChainExpression/file/libraryStringFieldCall.kt

@@ -1,5 +1,5 @@
 open class Library() {
-public val myString : String?
+public val myString : String? = null
 }
 open class User() {
 open fun main() : Unit {

testData/ast/class/class/abstractClassShape.kt

@@ -1,5 +1,5 @@
 abstract open class Shape() {
-public var color : String?
+public var color : String? = null
 open public fun setColor(c : String?) : Unit {
 color = c
 }

testData/ast/class/class/classWithMultiplyFields.kt

@@ -1,5 +1,5 @@
 class T() {
-var a : String?
-var b : String?
+var a : String? = null
+var b : String? = null
 var c : String? = "abc"
 }

testData/ast/constructors/file/allCallsPrimary2.kt

@@ -4,9 +4,9 @@ $myArg1 = arg1
 $myArg2 = 0
 $myArg3 = 0
 }
-val myArg1 : Int
-var myArg2 : Int
-var myArg3 : Int
+val myArg1 : Int = 0
+var myArg2 : Int = 0
+var myArg3 : Int = 0
 class object {
 open fun init(arg1 : Int, arg2 : Int, arg3 : Int) : C {
 val __ = C(arg1)

testData/ast/constructors/file/customerBuilder.kt

@@ -6,8 +6,8 @@ $_firstName = first
 $_lastName = last
 doSmthAfter()
 }
-public val _firstName : String?
-public val _lastName : String?
+public val _firstName : String? = null
+public val _lastName : String? = null
 open public fun getFirstName() : String? {
 return _firstName
 }

testData/ast/constructors/file/genericIdentifier.kt

@@ -3,8 +3,8 @@ public open class Identifier<T>(myName : T?, myHasDollar : Boolean) {
 $myName = myName
 $myHasDollar = myHasDollar
 }
-private val myName : T?
-private var myHasDollar : Boolean
+private val myName : T? = null
+private var myHasDollar : Boolean = false
 private var myNullable : Boolean = true
 open public fun getName() : T? {
 return myName

testData/ast/constructors/file/identifier.kt

@@ -3,8 +3,8 @@ public open class Identifier(myName : String?, myHasDollar : Boolean) {
 $myName = myName
 $myHasDollar = myHasDollar
 }
-private val myName : String?
-private var myHasDollar : Boolean
+private val myName : String? = null
+private var myHasDollar : Boolean = false
 private var myNullable : Boolean = true
 open public fun getName() : String? {
 return myName

testData/ast/constructors/file/withManyDefaultParams.kt

@@ -9,14 +9,14 @@ $e = e
 $f = f
 $g = g
 }
-private val myName : String?
-private var a : Boolean
-private var b : Double
-private var c : Float
-private var d : Long
-private var e : Int
-private var f : Short
-private var g : Char
+private val myName : String? = null
+private var a : Boolean = false
+private var b : Double = 0.dbl
+private var c : Float = 0.flt
+private var d : Long = 0
+private var e : Int = 0
+private var f : Short = 0
+private var g : Char = ' '
 class object {
 open public fun init() : Test {
 val __ = Test(null, false, 0.dbl, 0.flt, 0, 0, 0, ' ')

testData/ast/enum/class/enumWithNameField.kt

@@ -1,4 +1,4 @@
 enum E {
 I
-private var name : String?
+private var name : String? = null
 }

testData/ast/enum/class/primaryPrivateConstructor.kt

@@ -2,7 +2,7 @@ enum Color(c : Int) {
 {
 $code = c
 }
-private var code : Int
+private var code : Int = 0
 open public fun getCode() : Int {
 return code
 }

testData/ast/field/file/classChildExtendsBase.kt

@@ -1,6 +1,6 @@
 open class Base() {
-private var myFirst : String?
+private var myFirst : String? = null
 }
 open class Child() : Base() {
-private var mySecond : String?
+private var mySecond : String? = null
 }

testData/ast/field/file/internalField.kt

@@ -1,3 +1,3 @@
 open class C() {
-var f : Foo?
+var f : Foo? = null
 }

testData/ast/field/file/privateField.kt

@@ -1,3 +1,3 @@
 open class C() {
-private var f : Foo?
+private var f : Foo? = null
 }

testData/ast/field/file/protectedField.kt

@@ -1,3 +1,3 @@
 open class C() {
-protected var f : Foo?
+protected var f : Foo? = null
 }

testData/ast/field/file/publicField.kt

@@ -1,3 +1,3 @@
 open class C() {
-public var f : Foo?
+public var f : Foo? = null
 }

testData/ast/field/file/varWithoutInit.kt

@@ -1,3 +1,3 @@
 open class C() {
-var f : Foo?
+var f : Foo? = null
 }

testData/ast/identifier/file/finalFieldReference.kt

@@ -6,7 +6,7 @@ open class `$$`(`$$$$` : `$$$$$`?) : `$`() {
 {
 $`$$$` = `$$$$`
 }
-val `$$$` : `$$$$$`?
+val `$$$` : `$$$$$`? = null
 open public fun `$$$$$$`() : `$$$$$`? {
 return `$$$`
 }

testData/ast/inheritance/file/classOneExtendsBaseGeneric.kt

@@ -4,5 +4,5 @@ open class One<T, K>(name : T?, second : K?) : Base<T?>(name) {
 {
 $mySecond = second
 }
-private var mySecond : K?
+private var mySecond : K? = null
 }

testData/ast/inheritance/file/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.kt

@@ -4,5 +4,5 @@ open class One(name : String?, second : String?) : Base(name) {
 {
 $mySecond = second
 }
-private var mySecond : String?
+private var mySecond : String? = null
 }