New J2K: Fix existing test data

j2k/testData/fileOrElement/anonymousClass/kt-13146.new.kt

@@ -1,5 +1,5 @@
 class Test {
-    var someRunnable: Runnable? = object : Runnable {
+    var someRunnable: Runnable = object : Runnable {
         override fun run() {
             this.run()
         }
@@ -15,7 +15,7 @@ class Test2 {
 }
 
 class Handler {
-    fun postDelayed(r: Runnable?, time: Long) {}
+    fun postDelayed(r: Runnable, time: Long) {}
 }
 
 class Test3 {

j2k/testData/fileOrElement/arrayAccessExpression/expressionIndex.new.kt

@@ -1 +0,0 @@
-myArray[myLibrary!!.calculateIndex(100)]

j2k/testData/fileOrElement/arrayType/arrayInitializationStatement.new.kt

@@ -1 +1 @@
-val d2: Array<IntArray> = arrayOf()
+val d2: Array<IntArray?> = arrayOf()

j2k/testData/fileOrElement/arrayType/arrayInitializationStatementWithDimension.new.kt

@@ -0,0 +1 @@
+val d2: Array<IntArray?> = arrayOfNulls(5)

j2k/testData/fileOrElement/arrayType/arrayInitializationStatementWithDimension3d.new.kt

@@ -1 +1 @@
-val d3: Array<Array<IntArray>?> = Array(5) { arrayOfNulls<IntArray?>(5) }
+val d3 = Array<Array<IntArray>>(5) { arrayOfNulls(5) }

j2k/testData/fileOrElement/arrayType/d2StringEmptyArray.new.kt

@@ -1 +1 @@
-val ss: Array<Array<String?>?> = Array(5) { arrayOfNulls<String>(5) }
+val ss = Array<Array<String>>(5) { arrayOfNulls(5) }

j2k/testData/fileOrElement/arrayType/d3StringEmptyArray.new.kt

@@ -1 +1 @@
-val sss: Array<Array<Array<String?>?>?> = Array(5) { Array(5) { arrayOfNulls<String>(5) } }
+val sss = Array(5) { Array<Array<String>>(5) { arrayOfNulls(5) } }

j2k/testData/fileOrElement/assignmentExpression/nullability-settings.new.kt

@@ -2,9 +2,9 @@
 // !specifyLocalVariableTypeByDefault: true
 
 internal class Foo {
-    fun foo(o: HashSet<*>?) {
+    fun foo(o: HashSet<*>) {
-        val o2: HashSet<*>? = o
+        val o2: HashSet<*> = o
         var foo: Int = 0
-        foo = o2!!.size
+        foo = o2.size
     }
 }

j2k/testData/fileOrElement/assignmentExpression/nullability.new.kt

@@ -1,6 +0,0 @@
-internal class Foo {
-    fun foo(o: HashSet<*>?) {
-        var foo = 0
-        foo = o!!.size
-    }
-}

j2k/testData/fileOrElement/class/ClassShadowing.new.kt

@@ -0,0 +1,17 @@
+package test
+
+class Short(s: String?) {
+    companion object {
+        fun valueOf(value: String): Short {
+            return Short(value)
+        }
+    }
+}
+
+internal object Test {
+    fun test() {
+        Short.valueOf("1")
+        test.Short.valueOf("1")
+        java.lang.Short.valueOf("1")
+    }
+}

j2k/testData/fileOrElement/class/classWithFields.new.kt

@@ -1,4 +0,0 @@
-internal class T {
-    var a: String? = "abc"
-    var b = 10
-}

j2k/testData/fileOrElement/class/classWithMultiplyFields.new.kt

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

j2k/testData/fileOrElement/class/utilityClass4.new.kt

@@ -0,0 +1,10 @@
+internal object Util {
+    const val publicStr = ""
+    internal const val protectedStr = ""
+    const val packageStr = ""
+    private const val privateStr = ""
+    fun publicMethod() {}
+    internal fun protectedMethod() {}
+    fun packageMethod() {}
+    private fun privateMethod() {}
+}

j2k/testData/fileOrElement/comments/comments.new.kt

@@ -0,0 +1,29 @@
+// ERROR: Class 'A' is not abstract and does not implement abstract member public abstract fun run(): Unit defined in java.lang.Runnable
+package foo
+
+// we use package 'foo'
+
+// imports:
+import java.util.ArrayList
+
+// we need ArrayList
+// let's declare a class:
+internal class A /* just a sample name*/ : Runnable /* let's implement Runnable */ {
+    fun foo /* again a sample name */(p: Int /* parameter p */, c: Char /* parameter c */) {
+        // let's print something:
+        println("1") // print 1
+        println("2") // print 2
+
+        println("3") // print 3
+
+        // end of printing
+
+        if (p > 0) { // do this only when p > 0
+            // we print 4 and return
+            println("3")
+            return  // do not continue
+        }
+
+        // some code to be added
+    }
+} // end of class A

j2k/testData/fileOrElement/comments/comments2.new.kt

@@ -0,0 +1,33 @@
+// ERROR: A 'return' expression required in a function with a block body ('{...}')
+// ERROR: A 'return' expression required in a function with a block body ('{...}')
+package foo
+
+internal class A {
+    private/*it's private*/ val field = 0
+    fun /* nothing to return */ foo(/* no parameters at all */) {
+        // let declare a variable
+        // with 2 comments before
+        val /*int*/ a /* it's a */ = 2 /* it's 2 */ + 1 /* it's 1 */ // variable a declared
+    } // end of foo
+
+    fun /* we return int*/ foo(  /*int*/ p: Int/* parameter p */): Int { /* body is empty */
+    }
+
+    /*it's public*/ fun foo(s: String?): Char {}
+    protected/*it's protected*/ fun foo(c: Char) {}
+    /**
+     * Method description.
+     * Multi-line method description.
+     *
+     *
+     * @param param1 param1 description
+     * @param param2 param2 description
+     *
+     * @param param3 param3 description
+     */
+    fun foo(param1: String?, param2: String?, param3: String?) {}
+
+    companion object {
+        /*it's public*/const /*and static*/ val/*and final*/ C = 1
+    }
+}

j2k/testData/fileOrElement/conditionalExpression/simple.new.kt

@@ -1 +0,0 @@
-if (a!!.isEmpty()) 0 else 1

j2k/testData/fileOrElement/constructors/artificialPrimary.new.kt

@@ -1,6 +1,6 @@
 // ERROR: Property must be initialized or be abstract
 class Test {
-    private val s: String?
+    private val s: String
     internal var b = false
     internal var d = 0.0
 
@@ -8,7 +8,7 @@ class Test {
         b = true
     }
 
-    constructor(s: String?) {
+    constructor(s: String) {
         this.s = s
     }
 }

j2k/testData/fileOrElement/constructors/customerBuilder.kt

@@ -12,6 +12,7 @@ internal class Customer(val firstName: String, val lastName: String) {
 }
 
 internal class CustomerBuilder {
+    var _firstName = "Homer"
     var _firstName = "Homer"
     var _lastName = "Simpson"
 

j2k/testData/fileOrElement/constructors/customerBuilder.new.kt

@@ -1,6 +1,6 @@
 package org.test.customer
 
-internal class Customer(val firstName: String?, val lastName: String?) {
+internal class Customer(val firstName: String, val lastName: String) {
     init {
         doSmthBefore()
         doSmthAfter()
@@ -12,14 +12,14 @@ internal class Customer(val firstName: String?, val lastName: String?) {
 }
 
 internal class CustomerBuilder {
-    var _firstName: String? = "Homer"
+    var _firstName = "Homer"
-    var _lastName: String? = "Simpson"
+    var _lastName = "Simpson"
-    fun WithFirstName(firstName: String?): CustomerBuilder {
+    fun WithFirstName(firstName: String): CustomerBuilder {
         _firstName = firstName
         return this
     }
 
-    fun WithLastName(lastName: String?): CustomerBuilder {
+    fun WithLastName(lastName: String): CustomerBuilder {
         _lastName = lastName
         return this
     }

j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams6.new.kt

@@ -1,5 +1,5 @@
-internal class C(x: String?) {
+internal class C(x: String) {
-    var x: Any?
+    var x: Any
 
     init {
         this.x = x

j2k/testData/fileOrElement/constructors/genericIdentifier.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
@@ -22,7 +22,7 @@ class Identifier<T> {
 object User {
     fun main() {
         val i1: Identifier<*> = Identifier<String?>("name", false, true)
-        val i2 = Identifier<String?>("name", false)
+        val i2 = Identifier("name", false)
-        val i3 = Identifier<String?>("name")
+        val i3 = Identifier("name")
     }
 }

j2k/testData/fileOrElement/constructors/identifier.new.kt

@@ -1,19 +1,19 @@
 // ERROR: Property must be initialized or be abstract
 class Identifier {
-    val name: String?
+    val name: String
     private var myHasDollar = false
     private var myNullable = true
 
-    constructor(name: String?) {
+    constructor(name: String) {
         this.name = name
     }
 
-    constructor(name: String?, isNullable: Boolean) {
+    constructor(name: String, isNullable: Boolean) {
         this.name = name
         myNullable = isNullable
     }
 
-    constructor(name: String?, hasDollar: Boolean, isNullable: Boolean) {
+    constructor(name: String, hasDollar: Boolean, isNullable: Boolean) {
         this.name = name
         myHasDollar = hasDollar
         myNullable = isNullable

j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults.new.kt

@@ -1,6 +1,8 @@
-internal class A @JvmOverloads constructor(nested: Nested? = Nested(Nested.FIELD)) {
+internal class A @JvmOverloads constructor(nested: Nested = Nested(Nested.FIELD)) {
+
     internal class Nested(p: Int) {
         companion object {
+
             const val FIELD = 0
         }
     }

j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults2.new.kt

@@ -1,4 +1,4 @@
-internal class A @JvmOverloads constructor(nested: Nested? = Nested(Nested.FIELD)) {
+internal class A @JvmOverloads constructor(nested: Nested = Nested(Nested.FIELD)) {
     internal class Nested(p: Int) {
         companion object {
             const val FIELD = 0

j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults3.new.kt

@@ -1,6 +1,6 @@
 package pack
 
-internal class A @JvmOverloads constructor(nested: Nested? = Nested(Nested.FIELD)) {
+internal class A @JvmOverloads constructor(nested: Nested = Nested(Nested.FIELD)) {
     internal class Nested(p: Int) {
         companion object {
             const val FIELD = 0

j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults4.new.kt

@@ -1,6 +1,6 @@
 package pack
 
-internal class A @JvmOverloads constructor(nested: Nested? = Nested(Nested.FIELD)) {
+internal class A @JvmOverloads constructor(nested: Nested = Nested(Nested.FIELD)) {
     internal class Nested(p: Int) {
         companion object {
             const val FIELD = 0

j2k/testData/fileOrElement/constructors/secondaryConstructorWithDefaultValues.new.kt

@@ -1,11 +1,11 @@
 internal class A {
-    private var s: String? = ""
+    private var s = ""
     private var x = 0
 
     constructor() {}
 
     @JvmOverloads
-    constructor(p: Int, s: String?, x: Int = 1) {
+    constructor(p: Int, s: String, x: Int = 1) {
         this.s = s
         this.x = x
     }

j2k/testData/fileOrElement/constructors/secondaryConstructorWithDefaultValues2.new.kt

@@ -1,9 +1,9 @@
 internal class A() {
-    private var s: String? = ""
+    private var s = ""
     private var x = 0
 
     @JvmOverloads
-    constructor(p: Int, s: String?, x: Int = 1) : this() {
+    constructor(p: Int, s: String, x: Int = 1) : this() {
         this.s = s
         this.x = x
     }

j2k/testData/fileOrElement/constructors/secondaryConstructorsInNestedClass.new.kt

@@ -0,0 +1,46 @@
+// ERROR: Modifier 'protected' is not applicable inside 'object'
+internal object Outer {
+    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() {}
+    }
+
+    fun foo() {
+        val nested1 = Nested1(1)
+        val nested2 = Nested2(2)
+        val nested3 = Nested3(3)
+        val nested4 = Nested4(4)
+    }
+}

j2k/testData/fileOrElement/constructors/withManyDefaultParams.new.kt

@@ -1,6 +1,6 @@
 // ERROR: Property must be initialized or be abstract
 class Test {
-    private val myName: String?
+    private val myName: String
     internal var a = false
     internal var b = 0.0
     internal var c = 0f
@@ -11,13 +11,13 @@ class Test {
 
     constructor() {}
 
-    constructor(name: String?) {
+    constructor(name: String) {
         myName = foo(name)
     }
 
     companion object {
 
-        internal fun foo(n: String?): String {
+        internal fun foo(n: String): String {
             return ""
         }
     }

j2k/testData/fileOrElement/detectProperties/AssignFieldInsideSetter2.new.kt

@@ -0,0 +1,12 @@
+class C {
+    var x = ""
+        internal
+        set(x) {
+            println("setter invoked")
+            if (other != null) {
+                other!!.x = x
+            }
+            field = x
+        }
+    internal var other: C? = null
+}

j2k/testData/fileOrElement/detectProperties/DataClass.new.kt

@@ -1,4 +1,4 @@
-class Test(var id: String?, val name: String?, val age: Int) {
+class Test(var id: String, val name: String, val age: Int) {
 
     init {
         println(age)

j2k/testData/fileOrElement/detectProperties/DataClassWithAnnotations.new.kt

@@ -1,3 +1,3 @@
 internal annotation class TestAnnotation
 
-class Test(@field:TestAnnotation @set:TestAnnotation @get:TestAnnotation @param:TestAnnotation var arg: String?)
+class Test(@field:TestAnnotation @set:TestAnnotation @get:TestAnnotation @param:TestAnnotation var arg: String)

j2k/testData/fileOrElement/detectProperties/GetterWithSideEffect1.new.kt

@@ -1,7 +1,7 @@
 class C {
-    private var myX: String? = ""
+    private var myX = ""
 
-    var x: String?
+    var x: String
         get() {
             println("getter invoked")
             return myX

j2k/testData/fileOrElement/detectProperties/GetterWithSideEffect2.new.kt

@@ -1,12 +1,12 @@
 class C {
-    private var x: String? = ""
+    private var x = ""
 
-    fun getX(): String? {
+    fun getX(): String {
         println("getter invoked")
         return x
     }
 
-    fun setX(x: String?) {
+    fun setX(x: String) {
         this.x = x
     }
 

j2k/testData/fileOrElement/detectProperties/GetterWithSideEffect3.new.kt

@@ -1,12 +1,12 @@
 class C {
-    var x: String? = ""
+    var x = ""
 
-    fun getX(): String? {
+    fun getX(): String {
         println("getter invoked")
         return x
     }
 
-    fun setX(x: String?) {
+    fun setX(x: String) {
         this.x = x
     }
 }

j2k/testData/fileOrElement/detectProperties/GetterWithSideEffect4.new.kt

@@ -1,5 +1,5 @@
 class C {
-    var x: String? = ""
+    var x = ""
         get() {
             println("getter invoked")
             return field

j2k/testData/fileOrElement/detectProperties/GetterWithSideEffect5.new.kt

@@ -1,7 +0,0 @@
-class C {
-    var x: String? = ""
-        get() {
-            println("getter invoked")
-            return field
-        }
-}

j2k/testData/fileOrElement/detectProperties/PropertyType.new.kt

@@ -1,17 +1,16 @@
 internal class A {
-    private val list1: ArrayList<String?> = ArrayList()
+    private val list1: ArrayList<String> = ArrayList()
-    private val list2: MutableList<String?> = ArrayList()
+    private val list2: MutableList<String> = ArrayList()
-    private val myList3: MutableList<String?> = ArrayList()
+    private val myList3: MutableList<String> = ArrayList()
-
+    fun getList1(): List<String> {
-    fun getList1(): List<String?>? {
         return list1
     }
 
-    fun getList2(): List<String?>? {
+    fun getList2(): List<String> {
         return list2
     }
 
-    val list3: List<String?>?
+    val list3: List<String>
         get() = myList3
 
     fun foo() {

j2k/testData/fileOrElement/detectProperties/SetterWithSideEffect1.new.kt

@@ -1,7 +1,7 @@
 class C {
-    private var myX: String? = ""
+    private var myX = ""
 
-    var x: String?
+    var x: String
         get() = myX
         set(x) {
             println("setter invoked")

j2k/testData/fileOrElement/detectProperties/SetterWithSideEffect2.new.kt

@@ -1,11 +1,11 @@
 class C {
-    private var x: String? = ""
+    private var x = ""
 
-    fun getX(): String? {
+    fun getX(): String {
         return x
     }
 
-    fun setX(x: String?) {
+    fun setX(x: String) {
         println("setter invoked")
         this.x = x
     }

j2k/testData/fileOrElement/detectProperties/SetterWithSideEffect4.new.kt

@@ -1,5 +1,5 @@
 class C {
-    var x: String? = ""
+    var x = ""
         set(value) {
             println("setter invoked")
             field = value

j2k/testData/fileOrElement/detectProperties/SetterWithSideEffect5.new.kt

@@ -1,5 +1,5 @@
 class C {
-    var x: String? = ""
+    var x = ""
         set(x) {
             println("setter invoked")
             field = x

j2k/testData/fileOrElement/detectProperties/SetterWithSideEffect6.new.kt

@@ -1,5 +1,5 @@
 class C {
-    var x: String? = ""
+    var x = ""
         set(x) {
             println("old value: " + this.x)
             field = x

j2k/testData/fileOrElement/docComments/primaryConstructorDoc.new.kt

@@ -1,5 +1,5 @@
 internal class CtorComment {
-    var myA: String?
+    var myA: String
 
     /**
      * This constructor is especially useful
@@ -9,7 +9,7 @@ internal class CtorComment {
     }
 }
 
+internal class CtorComment2
 /**
  * This constructor is especially useful
- */
+ */
-internal class CtorComment2

j2k/testData/fileOrElement/enum/primaryPrivateConstructor.new.kt

@@ -0,0 +1,3 @@
+package demo
+
+internal enum class Color(val code: Int)

j2k/testData/fileOrElement/equals/EqOperator.new.kt

@@ -23,7 +23,7 @@ internal enum class EE {
 }
 
 internal class X {
-    fun foo(i1: I?, i2: I?, s1: String?, s2: String?, c1: C?, c2: C?, i: Int, o1: O?, o2: O?, e1: E?, e2: E?, bb1: BB?, bb2: BB?, arr1: IntArray, arr2: IntArray, ee1: EE?, ee2: EE?) {
+    fun foo(i1: I?, i2: I?, s1: String, s2: String, c1: C, c2: C, i: Int, o1: O, o2: O, e1: E, e2: E, bb1: BB, bb2: BB, arr1: IntArray, arr2: IntArray, ee1: EE?, ee2: EE) {
         if (i1 === i2) return
         if (s1 === s2) return
         if (c1 == c2) return

j2k/testData/fileOrElement/equals/Equals2.new.kt

@@ -1,9 +0,0 @@
-internal class C {
-    fun foo1(s1: String?, s2: String?): Boolean {
-        return s1 == s2
-    }
-
-    fun foo2(s1: String?, s2: String?): Boolean {
-        return s1 != s2
-    }
-}

j2k/testData/fileOrElement/equals/Equals3.new.kt

@@ -1,9 +0,0 @@
-internal class C {
-    fun equals(c: C?): Boolean {
-        return false
-    }
-
-    fun foo(c1: C, c2: C?): Boolean {
-        return c1.equals(c2)
-    }
-}

j2k/testData/fileOrElement/equals/Equals4.new.kt

@@ -1,5 +0,0 @@
-internal class C {
-    fun foo(s1: String?, s2: String?, s3: String?, s4: String?): Boolean {
-        return s1 == s2 == (s3 != s4)
-    }
-}

j2k/testData/fileOrElement/equals/ObjectsEquals.new.kt

@@ -1,3 +1,5 @@
+import java.util.Objects
+
 internal interface I
 
 internal class C {

j2k/testData/fileOrElement/field/conversion.new.kt

@@ -0,0 +1,13 @@
+internal class A {
+    private var i = byte.toInt()
+
+    fun foo() {
+        i = 10
+    }
+
+    companion object {
+
+        val byte: Byte
+            get() = 0
+    }
+}

j2k/testData/fileOrElement/field/needInitializer.new.kt

@@ -1,5 +1,5 @@
 class Init {
-    var field1: String?
+    var field1: String
     var field2: String? = null
 
     var field3: Int

j2k/testData/fileOrElement/field/specifyType.new.kt

@@ -1,21 +1,20 @@
-import java.util.ArrayList
+import java.util.*
 
 internal class A {
-    private val field1: List<String?> = ArrayList()
+    private val field1: List<String> = ArrayList()
-    val field2: List<String?> = ArrayList()
+    val field2: List<String> = ArrayList()
     val field3 = 0
     protected val field4 = 0
-    private var field5: List<String?>? = ArrayList()
+    private var field5: List<String> = ArrayList()
-    var field6: List<String?>? = ArrayList()
+    var field6: List<String> = ArrayList()
     private var field7 = 0
     var field8 = 0
     private var field9: String? = "a"
     private var field10: String? = foo()
-    private val anonymous: I = object : I {
+    private val anonymous: I = object : I {}
-    }
+    var anonymous2: I = object : I {}
-    var anonymous2: I? = object : I {}
+    private var anonymous3: I = object : I {}
-    private var anonymous3: I? = object : I {}
+    private var iimpl = anonymous
-    private var iimpl: I? = anonymous
     fun foo(): String {
         return "x"
     }
@@ -30,17 +29,17 @@ internal class A {
 
     internal interface I
 
-    fun testAnonymousObject(i: Any?) {
+    fun testAnonymousObject(i: Any) {
         if (true) {
-            iimpl = i as I?
+            iimpl = i as I
         } else if (true) {
-            anonymous3 = i as I?
+            anonymous3 = i as I
         }
         val anonymousLocal1: I = object : I {}
-        var anonymousLocal2: I? = object : I {}
+        var anonymousLocal2: I = object : I {}
         val iimpl = anonymousLocal1
         if (true) {
-            anonymousLocal2 = i as I?
+            anonymousLocal2 = i as I
         }
     }
 }

j2k/testData/fileOrElement/field/varWithInit.new.kt

@@ -1,5 +1,5 @@
 internal class Foo(a: Int, b: Int)
 
 internal class C {
-    var f: Foo? = Foo(1, 2)
+    var f = Foo(1, 2)
 }

j2k/testData/fileOrElement/for/forThroughListIndices.new.kt

@@ -1,11 +1,11 @@
 internal class C {
-    fun foo1(list: MutableList<String?>) {
+    fun foo1(list: MutableList<String>) {
         for (i in list.indices) {
             list[i] = "a"
         }
     }
 
-    fun foo2(list: ArrayList<String?>) {
+    fun foo2(list: ArrayList<String>) {
         for (i in list.indices) {
             list[i] = "a"
         }

j2k/testData/fileOrElement/for/forThroughListIndicesNE.new.kt

@@ -1,7 +1,9 @@
+import java.util.ArrayList
+
 internal class C {
-    fun foo(list: MutableList<String?>) {
+    fun foo(list: MutableList<String>) {
         for (i in list.indices) {
             list[i] = "a"
         }
     }
-}
+}

j2k/testData/fileOrElement/for/overMapEntries.new.kt

@@ -1,7 +1,7 @@
 internal object Test {
     @JvmStatic
     fun main(args: Array<String>) {
-        val resultMap: Map<String?, String?> = HashMap()
+        val resultMap: Map<String, String> = HashMap()
         for ((key, type) in resultMap) {
             if (key == "myKey") {
                 println(type)

j2k/testData/fileOrElement/formatting/nonStaticMembers.new.kt

@@ -0,0 +1,10 @@
+internal class F {
+    var i = 0
+
+    fun f1() {}
+
+
+    fun f2() {}
+
+    fun f3() {}
+}

j2k/testData/fileOrElement/formatting/nonStaticMembersWithComments.new.kt

@@ -0,0 +1,21 @@
+internal class F {
+    var i = 0
+
+    //c1
+
+    /*c2*/
+
+    fun f1() {}
+
+
+    //c3
+
+
+    //c4
+
+    fun f2() {}
+
+    fun f3() {}
+
+    //c5
+}

j2k/testData/fileOrElement/formatting/staticAndNonStaticMembersWithComments.new.kt

@@ -0,0 +1,31 @@
+internal class F {
+
+
+    //c3
+
+
+    //c4
+
+    fun f2() {}
+
+    fun f3() {}
+
+    fun f4() {}
+
+    companion object {
+
+        //c1
+
+        /*c2*/
+
+        fun f1() {}
+        var i = 0
+
+        //c5
+
+        fun f5() {}
+    }
+
+    //c6
+
+}

j2k/testData/fileOrElement/formatting/staticMembersWithComments.new.kt

@@ -0,0 +1,21 @@
+internal object F {
+    var i = 0
+
+    //c1
+
+    /*c2*/
+
+    fun f1() {}
+
+
+    //c3
+
+
+    //c4
+
+    fun f2() {}
+
+    fun f3() {}
+
+    //c5
+}

j2k/testData/fileOrElement/function/varVararg.new.kt

@@ -2,7 +2,7 @@ package demo
 
 internal class Test {
     fun test(vararg args: Any?) {
-        var args: Any? = args
+        var argsx = args
         args = arrayOf(1, 2, 3)
     }
 }

j2k/testData/fileOrElement/inheritance/classOneExtendsBaseGeneric.new.kt

@@ -1,3 +1,3 @@
 internal open class Base<T>(name: T?)
 
-internal class One<T, K>(name: T?, private val mySecond: K?) : Base<T?>(name)
+internal class One<T, K>(name: T?, private val mySecond: K) : Base<T>(name)

j2k/testData/fileOrElement/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.new.kt

@@ -1,3 +1,3 @@
-internal open class Base(name: String?)
+internal open class Base(name: String)
 
-internal class One(name: String?, private val mySecond: String?) : Base(name)
+internal class One(name: String, private val mySecond: String) : Base(name)

j2k/testData/fileOrElement/isOperator/complicatedExpression.new.kt

@@ -1 +0,0 @@
-c!!.getType().getName() is String

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 i2 = Identifier("name", false)
-        val i3 = Identifier<String?>("name")
+        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)
+        putString(One.myContainer.myString)
-        StringContainer(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)
+        if (One.myContainer.myBoolean) println("Ok")
-            println("Ok")
+        val s = if (One.myContainer.myBoolean) "YES" else "NO"
-
+        while (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()
-}

j2k/testData/fileOrElement/kotlinApiAccess/ClassObjectMembers.java

@@ -1,10 +1,9 @@
 //file
+
 import kotlinApi.KotlinClass;
 
 class C {
     int foo() {
-        KotlinClass.staticVar = KotlinClass.staticVar * 2;
+        KotlinClass.Companion.getStaticVar()
-        KotlinClass.Companion.setStaticProperty(KotlinClass.Companion.getStaticVar() + KotlinClass.Companion.getStaticProperty());
-        return KotlinClass.Companion.staticFun(1);
     }
 }

j2k/testData/fileOrElement/labelStatement/complicatedExampleFromJavaTutorial.new.kt

@@ -1,9 +1,9 @@
 test@ for (i in 0..max) {
-    var n: Int = substring!!.length()
+    var n: Int = substring.length()
     var j = i
     var k = 0
     while (n-- != 0) {
-        if (searchMe!!.charAt(j++) !== substring!!.charAt(k++)) {
+        if (searchMe.charAt(j++) !== substring.charAt(k++)) {
             continue@test
         }
     }

j2k/testData/fileOrElement/list/ForEach.new.kt

@@ -1,10 +1,10 @@
 // ERROR: Unresolved reference: LinkedList
-import java.util.ArrayList
+import java.util.*
 
 class ForEach {
     fun test() {
         val xs: ArrayList<Any?> = ArrayList()
-        val ys: MutableList<Any?> = LinkedList<Any?>()
+        val ys: MutableList<Any?> = LinkedList<Any>()
         for (x in xs) {
             ys.add(x)
         }

j2k/testData/fileOrElement/list/Lists.new.kt

@@ -1,12 +1,10 @@
 // ERROR: Unresolved reference: LinkedList
-// ERROR: Null can not be a value of a non-null type Any
+import java.util.*
-// ERROR: Null can not be a value of a non-null type Any
-import java.util.ArrayList
 
 class Lists {
     fun test() {
         val xs: MutableList<Any?> = ArrayList()
-        val ys: MutableList<Any?> = LinkedList<Any?>()
+        val ys: MutableList<Any?> = LinkedList<Any>()
         val zs: ArrayList<Any?> = ArrayList()
         xs.add(null)
         ys.add(null)

j2k/testData/fileOrElement/literalExpression/double.new.kt

@@ -0,0 +1,24 @@
+internal class A {
+    private var d1 = 1.0
+    private var d2 = 1.0
+    private val d3 = 1.0
+    private val d4 = 1.0
+    private val d5 = 1.0
+    private val d6 = 1.0
+    private val d7 = Math.sqrt(2.0) - 1
+    private val d8 = 1.0
+    private val d9 = 1.0
+    private val x = 1 / (1.0 + 0)
+
+    fun foo1(d: Double) {}
+    fun foo2(d: Double) {}
+
+    fun bar() {
+        foo1(1.0)
+        foo1(1.0)
+        foo1(1.0)
+        foo2(1.0)
+        d1 = 1.0
+        d2 = 1.0
+    }
+}

j2k/testData/fileOrElement/literalExpression/exponentDouble.new.kt

@@ -0,0 +1,9 @@
+class Exponent {
+    private val doubles = doubleArrayOf(
+        5e5, +5e5, -5e5, 5e+5, 5e-5,
+        5E5, +5E5, -5E5, 5E+5, 5E-5,
+        2.5e5, +2.5e5, -2.5e5, 2.5e+5, 2.5e-5,
+        2.5E5, +2.5E5, -2.5E5, 2.5E+5, 2.5E-5, 5e5, 5e5, 5e5, 5e5,
+        5e-6, 7e+8, 9e-1, 2e+3, 4e5, 6e7
+    )
+}

j2k/testData/fileOrElement/literalExpression/exponentFloat.new.kt

@@ -0,0 +1,10 @@
+class Exponent {
+    private val floats = floatArrayOf(
+        5e5f, +5e5f, -5e5f, 5e+5f, 5e-5f,
+        5E5f, +5E5f, -5E5f, 5E+5f, 5E-5f,
+        2.5e5f, +2.5e5f, -2.5e5f, 2.5e+5f, 2.5e-5f,
+        2.5E5f, +2.5E5f, -2.5E5f, 2.5E+5f, 2.5E-5f,
+        5e5f, 5e5f,
+        5e-6f, 7e+8f, 9e-1f, 2e+3f, 4e5f, 6e7f
+    )
+}

j2k/testData/fileOrElement/literalExpression/float.new.kt

@@ -0,0 +1,26 @@
+internal class A {
+    private var f1 = 1.0f
+    private val f2 = 1.0f
+    private val f3 = 1f
+    private var f4 = 1f
+    private val f5 = 1f
+    private val f6 = -1f
+    private val f7 = -1f
+    private val f8 = +1f
+    private val f9 = 1f
+    private val f10 = 1f
+
+    fun foo1(f: Float) {}
+    fun foo2(f: Float) {}
+
+    fun bar() {
+        foo1(1f)
+        foo2(1f)
+        foo1(1f)
+        foo1(1f)
+        foo1(-1f)
+        foo1(-1f)
+        f1 = 1f
+        f4 = 1.0f
+    }
+}

j2k/testData/fileOrElement/literalExpression/long.new.kt

@@ -9,7 +9,7 @@ internal class A {
     private val l8 = +1L
 
     fun foo1(l: Long) {}
-    fun foo2(l: Long?) {}
+    fun foo2(l: Long) {}
 
     fun bar() {
         foo1(1)

j2k/testData/fileOrElement/literalExpression/stringOctalChars.new.kt

@@ -1,7 +0,0 @@
-class A {
-    var a: String? = "\u003f0123"
-    var b: String? = "\u00490123"
-    var c: String? = "\u00ff0123"
-    var d: String? = "\u0000Text"
-    var f: String? = "\u00009"
-}

j2k/testData/fileOrElement/methodCallExpression/genericMethod.new.kt

@@ -1,12 +1,12 @@
 package demo
 
 internal class Map {
-    fun <K, V> put(k: K?, v: V?) {}
+    fun <K, V> put(k: K?, v: V) {}
 }
 
 internal class U {
     fun test() {
         val m = Map()
-        m.put<String?, Int?>(null, 10)
+        m.put<String, Int>(null, 10)
     }
 }

j2k/testData/fileOrElement/mutableCollections/FunctionReturnValue.new.kt

@@ -1,11 +1,11 @@
-import java.util.ArrayList  
+import java.util.*
 
 internal class A {
-    fun createCollection(): MutableCollection<String?> {
+    fun createCollection(): MutableCollection<String> {
         return ArrayList()
     }
 
-    fun foo(): Collection<String?> {
+    fun foo(): Collection<String> {
         val collection = createCollection()
         collection.add("a")
         return collection

j2k/testData/fileOrElement/mutableCollections/FunctionReturnValue2.new.kt

@@ -1,21 +1,21 @@
-import java.util.ArrayList
+import java.util.*
 
 internal class A {
-    private val collection: MutableCollection<String?>?
+    private val collection: MutableCollection<String>
 
     init {
         collection = createCollection()
     }
 
-    fun createCollection(): MutableCollection<String?> {
+    fun createCollection(): MutableCollection<String> {
         return ArrayList()
     }
 
     fun foo() {
-        collection!!.add("1")
+        collection.add("1")
     }
 
-    fun getCollection(): Collection<String?>? {
+    fun getCollection(): Collection<String> {
         return collection
     }
 }

j2k/testData/fileOrElement/mutableCollections/Iterator2.new.kt

@@ -1,5 +1,5 @@
 class TestMutableCollection {
-    val list: MutableList<String?> = ArrayList()
+    val list: MutableList<String> = ArrayList()
 
     fun test() {
         val it = list.iterator()

j2k/testData/fileOrElement/newClassExpression/genericClassInvocation.new.kt

@@ -1,5 +1,5 @@
 internal class User {
     fun main() {
-        val list: List<String?> = ArrayList()
+        val list: List<String> = ArrayList()
     }
 }

j2k/testData/fileOrElement/newClassExpression/newListAndNewMember.new.kt

@@ -1,10 +1,12 @@
 package org.test
 
+import java.util.ArrayList
+
 internal class Member
 
 internal class User {
     fun main() {
-        val members: MutableList<Member?> = ArrayList()
+        val members: MutableList<Member> = ArrayList()
         members.add(Member())
     }
 }

j2k/testData/fileOrElement/nullability/nullableField.new.kt

@@ -0,0 +1,45 @@
+package test
+
+class Test {
+    private var myProp: String? = null
+    private var myIntProp: Int? = null
+    fun onCreate() {
+        myProp = ""
+        myIntProp = 1
+    }
+
+    fun test1() {
+        foo1(myProp!!)
+    }
+
+    fun test2() {
+        foo2(myProp)
+    }
+
+    fun test3() {
+        foo3(myProp)
+    }
+
+    fun test4() {
+        myProp!![myIntProp!!]
+        println(myProp)
+    }
+
+    fun test5() {
+        val b = "aaa" == myProp
+        val s = "aaa$myProp"
+    }
+
+    fun test6() {
+        myProp!!.compareTo(myProp!!, ignoreCase = true)
+    }
+
+    fun test7() {
+        val list: MutableList<Int> = ArrayList()
+        list.remove(myIntProp!!)
+    }
+
+    fun foo1(s: String) {}
+    fun foo2(s: String?) {}
+    fun foo3(s: String?) {}
+}

j2k/testData/fileOrElement/nullability/nullableInitializer4.new.kt

@@ -0,0 +1,19 @@
+class TestJava {
+    private var notNullInitializerFieldNullableUsage: String? = "aaa"
+    private var notNullInitializerFieldNotNullUsage = "aaa"
+    private var nullInitializerFieldNullableUsage: String? = null
+    private var nullInitializerFieldNotNullUsage: String? = null
+    fun testNotNull(obj: Any?) {
+        if (true) {
+            notNullInitializerFieldNullableUsage = obj as String?
+            notNullInitializerFieldNotNullUsage = "str"
+            notNullInitializerFieldNullableUsage!![1]
+            notNullInitializerFieldNotNullUsage[1]
+        } else {
+            nullInitializerFieldNullableUsage = obj as String?
+            nullInitializerFieldNotNullUsage = "str"
+            nullInitializerFieldNullableUsage!![1]
+            nullInitializerFieldNotNullUsage!![1]
+        }
+    }
+}

j2k/testData/fileOrElement/overloads/Annotations.new.kt

@@ -1,5 +1,3 @@
-// ERROR: Type mismatch: inferred type is Any? but Any was expected
-// ERROR: Type mismatch: inferred type is Any? but Any was expected
 internal class A {
     @JvmOverloads
     fun foo(s: String? = null): Any {
@@ -13,7 +11,7 @@ internal class A {
     }
 
     fun bar(): Any {
-        return bar(null)
+        return bar(null)!!
     }
 
     fun bar1(s: String?): Any? {
@@ -22,7 +20,7 @@ internal class A {
     }
 
     fun bar1(): Any {
-        return bar1(null)
+        return bar1(null)!!
     }
 
     @Deprecated("")