Java to Kotlin converter: do not generate default field initializer when it's incorrect anyway

j2k/src/org/jetbrains/jet/j2k/ConstructorConverter.kt

@@ -169,7 +169,7 @@ class ConstructorConverter(private val converter: Converter) {
         assert(classBody.primaryConstructorSignature == null)
 
         val finalOrWithEmptyInitializerFields = classBody.members.filterIsInstance(javaClass<Field>()).filter { it.isVal || it.initializer.isEmpty }
-        val initializers = HashMap<Field, Expression>()
+        val initializers = HashMap<Field, Expression?>()
         for (factoryFunction in classBody.factoryFunctions()) {
             for (field in finalOrWithEmptyInitializerFields) {
                 initializers.put(field, getDefaultInitializer(field))
@@ -198,9 +198,8 @@ class ConstructorConverter(private val converter: Converter) {
                 }
             }
 
-            val initializer = MethodCallExpression.buildNotNull(null,
+            val arguments = finalOrWithEmptyInitializerFields.map { initializers[it] ?: LiteralExpression("null").assignNoPrototype() }
-                                                                className.name,
+            val initializer = MethodCallExpression.buildNotNull(null, className.name, arguments).assignNoPrototype()
-                                                                finalOrWithEmptyInitializerFields.map { initializers[it]!! }).assignNoPrototype()
             if (statements.isNotEmpty()) {
                 val localVar = LocalVariable(tempValIdentifier(),
                                              Annotations.Empty,

j2k/src/org/jetbrains/jet/j2k/Utils.kt

@@ -49,7 +49,7 @@ fun PsiVariable.countWriteAccesses(scope: PsiElement?): Int
 fun PsiVariable.hasWriteAccesses(scope: PsiElement?): Boolean
         = if (scope != null) findVariableUsages(this, scope).any { PsiUtil.isAccessedForWriting(it) } else false
 
-fun getDefaultInitializer(field: Field): Expression {
+fun getDefaultInitializer(field: Field): Expression? {
     val t = field.`type`
     val result = if (t.isNullable) {
         LiteralExpression("null")
@@ -64,9 +64,9 @@ fun getDefaultInitializer(field: Field): Expression {
         }
     }
     else {
-        LiteralExpression("0")
+        null
     }
-    return result.assignNoPrototype()
+    return result?.assignNoPrototype()
 }
 
 fun isVal(field: PsiField): Boolean {

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

@@ -41,7 +41,7 @@ class Field(
 
         var initializerToUse = initializer
         if (initializerToUse.isEmpty && defaultInitializer) {
-            initializerToUse = getDefaultInitializer(this)
+            initializerToUse = getDefaultInitializer(this) ?: Expression.Empty
         }
         if (!initializerToUse.isEmpty) {
             builder append " = " append initializerToUse

j2k/tests/testData/ast/anonymousBlock/oneAnonBlock.kt

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

j2k/tests/testData/ast/anonymousBlock/oneStaticAnonBlock.kt

@@ -1,5 +1,5 @@
 class Test {
-    var str: String = 0
+    var str: String
 
     class object {
         {

j2k/tests/testData/ast/callChainExpression/libraryFieldCall.kt

@@ -1,6 +1,6 @@
 class Library {
     class object {
-        val ourOut: java.io.PrintStream = 0
+        val ourOut: java.io.PrintStream
     }
 }
 

j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.kt

@@ -1,5 +1,5 @@
 class Library {
-    public val myString: String = 0
+    public val myString: String
 }
 
 class User {

j2k/tests/testData/ast/class/abstractClassShape.kt

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

j2k/tests/testData/ast/class/classWithMultiplyFields.kt

@@ -1,5 +1,5 @@
 class T {
-    var a: String = 0
+    var a: String
-    var b: String = 0
+    var b: String
     var c = "abc"
 }

j2k/tests/testData/ast/constructors/fieldsInitializedFromParams6.kt

@@ -1,5 +1,5 @@
 class C(x: String) {
-    public var x: Any = 0
+    public var x: Any
 
     {
         this.x = x

j2k/tests/testData/ast/constructors/fieldsInitializedFromParams7.kt

@@ -1,5 +1,5 @@
 class C(x: Any, b: Boolean) {
-    public var x: Any = 0
+    public var x: Any
 
     {
         if (b) {

j2k/tests/testData/ast/constructors/withManyDefaultParams.kt

@@ -2,7 +2,7 @@ public class Test private(private val myName: String, var a: Boolean, var b: Dou
     class object {
 
         public fun create(): Test {
-            return Test(0, false, 0.toDouble(), 0.toFloat(), 0, 0, 0, ' ')
+            return Test(null, false, 0.toDouble(), 0.toFloat(), 0, 0, 0, ' ')
         }
 
         public fun create(name: String): Test {

j2k/tests/testData/ast/field/internalField.kt

@@ -1,3 +1,3 @@
 class C {
-    var f: Foo = 0
+    var f: Foo
 }

j2k/tests/testData/ast/field/protectedField.kt

@@ -1,3 +1,3 @@
 class C {
-    protected var f: Foo = 0
+    protected var f: Foo
 }

j2k/tests/testData/ast/field/publicField.kt

@@ -1,3 +1,3 @@
 class C {
-    public var f: Foo = 0
+    public var f: Foo
 }

j2k/tests/testData/ast/field/varWithoutInit.kt

@@ -1,3 +1,3 @@
 class C {
-    var f: Foo = 0
+    var f: Foo
 }