New J2K: Fix existing test data

j2k/testData/fileOrElement/issues/Outer.kt

@@ -0,0 +1,33 @@
+// ERROR: Modifier 'protected' is not applicable inside 'object'
+internal object Outer {
+    fun foo() {
+        val nested1 = Nested1(1)
+        val nested2 = Nested2(2)
+        val nested3 = Nested3(3)
+        val nested4 = Nested4(4)
+    }
+
+    private class Nested1() {
+        constructor(a: Int) : this() {}
+        protected constructor(c: Char) : this() {}
+        private constructor(b: Boolean) : this() {}
+    }
+
+    protected class Nested2() {
+        constructor(a: Int) : this() {}
+        protected constructor(c: Char) : this() {}
+        private constructor(b: Boolean) : this() {}
+    }
+
+    internal class Nested3() {
+        constructor(a: Int) : this() {}
+        protected constructor(c: Char) : this() {}
+        private constructor(b: Boolean) : this() {}
+    }
+
+    class Nested4() {
+        constructor(a: Int) : this() {}
+        protected constructor(c: Char) : this() {}
+        private constructor(b: Boolean) : this() {}
+    }
+}

j2k/testData/fileOrElement/issues/kt-14248.new.kt

@@ -1 +0,0 @@
-class AppInfo(internal var mName: String?, internal var mIcon: String?, internal var mLastUpdateTime: Long)

j2k/testData/fileOrElement/issues/kt-19634.new.kt

@@ -0,0 +1,5 @@
+class TestBoxedEqEqPrimitive {
+    fun test(value: Double): Boolean {
+        return value == 3.14
+    }
+}

j2k/testData/fileOrElement/issues/kt-5294.new.kt

@@ -1,3 +0,0 @@
-internal class X(private val list: List<Y?>?) {
-    internal inner class Y
-}

j2k/testData/fileOrElement/issues/kt-543-boxed.new.kt

@@ -1,7 +1,7 @@
 package demo
 
 internal class Test {
-    fun putInt(i: Int?) {}
+    fun putInt(i: Int) {}
 
     fun test() {
         val b: Byte = 10

j2k/testData/fileOrElement/issues/kt-543-mixed.new.kt

@@ -0,0 +1,10 @@
+package demo
+
+internal class Test {
+    fun putInt(i: Int) {}
+
+    fun test() {
+        val i = 10
+        putInt(i)
+    }
+}

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

@@ -1,18 +1,18 @@
 class Identifier<T> {
-    val name: T?
+    val name: T
     private var myHasDollar = false
     private var myNullable = true
 
-    constructor(name: T?) {
+    constructor(name: T) {
         this.name = name
     }
 
-    constructor(name: T?, isNullable: Boolean) {
+    constructor(name: T, isNullable: Boolean) {
         this.name = name
         myNullable = isNullable
     }
 
-    constructor(name: T?, hasDollar: Boolean, isNullable: Boolean) {
+    constructor(name: T, hasDollar: Boolean, isNullable: Boolean) {
         this.name = name
         myHasDollar = hasDollar
         myNullable = isNullable
@@ -23,7 +23,7 @@ object User {
     @JvmStatic
     fun main(args: Array<String>) {
         val i1: Identifier<*> = Identifier<String?>("name", false, true)
-        val i2 = Identifier<String?>("name", false)
-        val i3 = Identifier<String?>("name")
+        val i2 = Identifier("name", false)
+        val i3 = Identifier("name")
     }
-}   
+}

j2k/testData/fileOrElement/issues/kt-794-mixed.new.kt

@@ -0,0 +1,11 @@
+package demo
+
+internal class Test {
+    fun getInteger(i: Int): Int {
+        return i
+    }
+
+    fun test() {
+        val i = getInteger(10)
+    }
+}

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

@@ -1,19 +1,19 @@
 package demo
 
 internal class Container {
-    var myString: String? = "1"
+    var myString = "1"
 }
 
 internal object One {
-    var myContainer: Container? = Container()
+    var myContainer = Container()
 }
 
 internal class StringContainer(s: String?)
 
 internal class Test {
-    fun putString(s: String?) {}
+    fun putString(s: String) {}
     fun test() {
-        putString(One.myContainer!!.myString)
-        StringContainer(One.myContainer!!.myString)
+        putString(One.myContainer.myString)
+        StringContainer(One.myContainer.myString)
     }
 }

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

@@ -1,19 +0,0 @@
-package demo
-
-internal class Container {
-    var myInt = 1
-}
-
-internal object One {
-    var myContainer: Container? = Container()
-}
-
-internal class IntContainer(i: Int)
-
-internal class Test {
-    fun putInt(i: Int) {}
-    fun test() {
-        putInt(One.myContainer!!.myInt)
-        IntContainer(One.myContainer!!.myInt)
-    }
-}

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

@@ -1,13 +0,0 @@
-package demo
-
-internal class Container {
-    var myInt = 1
-}
-
-internal object One {
-    var myContainer: Container? = Container()
-}
-
-internal class Test {
-    var b = One.myContainer!!.myInt.toByte()
-}

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

@@ -1,15 +0,0 @@
-package demo
-
-internal class Container {
-    var myInt = 1
-}
-
-internal object One {
-    var myContainer: Container? = Container()
-}
-
-internal class Test {
-    fun test() {
-        val b = One.myContainer!!.myInt.toByte()
-    }
-}

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

@@ -5,21 +5,16 @@ internal class Container {
 }
 
 internal object One {
-    var myContainer: Container? = Container()
+    var myContainer = Container()
 }
 
 internal class Test {
     fun test() {
-        if (One.myContainer!!.myBoolean)
-            println("Ok")
-
-        val s = if (One.myContainer!!.myBoolean) "YES" else "NO"
-
-        while (One.myContainer!!.myBoolean)
-            println("Ok")
-
+        if (One.myContainer.myBoolean) println("Ok")
+        val s = if (One.myContainer.myBoolean) "YES" else "NO"
+        while (One.myContainer.myBoolean) println("Ok")
         do {
             println("Ok")
-        } while (One.myContainer!!.myBoolean)
+        } while (One.myContainer.myBoolean)
     }
 }

j2k/testData/fileOrElement/issues/kt-836.new.kt

@@ -1,23 +0,0 @@
-package com.voltvoodoo.saplo4j.model
-
-import java.io.Serializable
-
-class Language(protected var code: String?) : Serializable {
-    override fun toString(): String {
-        return code
-    }
-}
-
-internal open class Base {
-    internal open fun test() {}
-    override fun toString(): String {
-        return "BASE"
-    }
-}
-
-internal class Child : Base() {
-    override fun test() {}
-    override fun toString(): String {
-        return "Child"
-    }
-}

j2k/testData/fileOrElement/issues/spaceBeforeAssignment.new.kt

@@ -1,5 +0,0 @@
-import java.util.ArrayList
-
-internal class A {
-    var list: List<String?>? = ArrayList()
-}