New J2K: separate nullability inference from common one & nullability bug fixes

It will be needed for structure mutability inference

#KT-21467 fixed
#KT-32609 fixed
#KT-32572 fixed
#KT-24677 fixed

nj2k/testData/copyPaste/SeveralMethodsSample.expected.kt

@@ -1,7 +1,7 @@
 class A {
     fun someOther() = false
 
-    private fun formatElement(element: PsiElement): String {
+    private fun formatElement(element: PsiElement): String? {
         var element: PsiElement = element
         element = JetPsiUtil.ascendIfPropertyAccessor(element)
         if (element is JetNamedFunction || element is JetProperty) {
@@ -28,9 +28,9 @@ class A {
     }
 
     fun getSelected(): ArrayList<UsageInfo> {
-        val result: ArrayList<UsageInfo> = ArrayList<UsageInfo>()
+        val result: ArrayList<UsageInfo> = ArrayList<UsageInfo?>()
         for (i in 0 until myChecked.length) {
-            if (myChecked[i]) {
+            if (myChecked.get(i)) {
                 result.add(myOverridingMethods.get(i))
             }
         }

nj2k/testData/copyPastePlainText/AsExpression.expected.kt

@@ -3,5 +3,5 @@ import java.util.ArrayList
 
 
 fun foo() {
-    bar(ArrayList<String>())
+    bar(ArrayList<String?>())
 }

nj2k/testData/copyPastePlainText/AsExpressionBody.expected.kt

@@ -2,4 +2,4 @@
 import java.util.ArrayList
 
 
-fun foo() = ArrayList<String>()
+fun foo() = ArrayList<String?>()

nj2k/testData/copyPastePlainText/ImportFromTarget.expected.kt

@@ -4,7 +4,7 @@ import java.util.UUID
 
 
 class ExampleClass {
-    override fun toString(): String {
+    override fun toString(): String? {
         return UUID.randomUUID().toString()
     }
 }

nj2k/testData/copyPastePlainText/ImportResolve.expected.kt

@@ -9,7 +9,7 @@ import java.util.HashMap
 class Target {
     var listOfPlatformType: List<String> = ArrayList()
 
-    var unresolved: UnresolvedInterface<UnresolvedGeneric?>? = UnresolvedImplementation() // Should not add import
+    var unresolved: UnresolvedInterface<UnresolvedGeneric?> = UnresolvedImplementation() // Should not add import
 
 
     var hashMapOfNotImported: Map<ToBeImportedJava, ToBeImportedKotlin> = HashMap()
@@ -18,11 +18,11 @@ class Target {
 
     internal fun acceptJavaClass(tbi: ToBeImportedJava?) {}
 
-    var ambiguousKotlin: IAmbiguousKotlin? = AmbiguousKotlin() // Should not add import in case of 2 declarations in Kotlin
+    var ambiguousKotlin: IAmbiguousKotlin = AmbiguousKotlin() // Should not add import in case of 2 declarations in Kotlin
 
-    var ambiguous: IAmbiguous? = Ambiguous() // Should not add import in case of ambiguous declarations in Kotlin and in Java
+    var ambiguous: IAmbiguous = Ambiguous() // Should not add import in case of ambiguous declarations in Kotlin and in Java
 
-    var ambiguousJava: IAmbiguousJava? = AmbiguousJava()  // Should not add import in case of 2 declarations in Java
+    var ambiguousJava: IAmbiguousJava = AmbiguousJava()  // Should not add import in case of 2 declarations in Java
 
 
     internal fun workWithStatics() {

nj2k/testData/copyPastePlainText/KT13529_1.expected.kt

@@ -3,5 +3,5 @@ import java.util.ArrayList
 
 
 fun foo() {
-    bar(/*comment*/ArrayList<String>())
+    bar(/*comment*/ArrayList<String?>())
 }

nj2k/testData/copyPastePlainText/PostProcessing.expected.kt

@@ -6,7 +6,7 @@ import java.util.ArrayList
 
 class JavaClass {
     internal fun foo(file: File?, target: List<String?>?) {
-        val list = ArrayList<String?>()
+        val list = ArrayList<String>()
         if (file != null) {
             list.add(file.name)
         }

nj2k/testData/inference/common/arrayAssignment.kt

@@ -0,0 +1,8 @@
+fun test() {
+    val x: /*T2@*/Array</*T1@*/Int> = arrayOf</*T0@*/Int>()/*Array<T0@Int>*/
+    val y: /*T4@*/Array</*T3@*/Int> = x/*T2@Array<T1@Int>*/
+}
+
+//T1 := T0 due to 'INITIALIZER'
+//T3 := T1 due to 'INITIALIZER'
+//T2 <: T4 due to 'INITIALIZER'

nj2k/testData/inference/common/arrayOfArrays.kt

@@ -0,0 +1,16 @@
+class Test {
+    fun foo() {
+        val x: /*T5@*/Array</*T4@*/Array</*T3@*/Int>> =
+            Array</*T2@*/Array</*T1@*/Int>>(1/*LIT*/, {
+                arrayOf</*T0@*/Int>(2/*LIT*/)/*Array<T0@Int>*/
+            }/*Function0<Int, T6@Array<T7@Int>>*/
+        )/*Array<T2@Array<T1@Int>>*/
+    }
+}
+
+//LOWER <: T0 due to 'PARAMETER'
+//T7 := T0 due to 'RETURN'
+//T1 := T7 due to 'PARAMETER'
+//T6 <: T2 due to 'PARAMETER'
+//T3 := T1 due to 'INITIALIZER'
+//T4 := T2 due to 'INITIALIZER'

nj2k/testData/inference/common/callFunctionWithTypeParamFromOuterScope.kt

@@ -0,0 +1,12 @@
+class X<T> {
+    fun x(): /*T1@*/List</*T0@*/T> {
+        TODO()
+    }
+
+    fun y() {
+        val a: /*T3@*/List</*T2@*/T> = x()/*T1@List<T0@T>*/
+    }
+}
+
+//T0 <: T2 due to 'INITIALIZER'
+//T1 <: T3 due to 'INITIALIZER'

nj2k/testData/inference/common/callWithTypeParams.kt

@@ -0,0 +1,9 @@
+fun test() {
+    foo</*T1@*/Int>(
+        listOf</*T0@*/Int>()/*List<T0@Int>*/
+    )
+}
+
+fun <T> foo (x: /*T3@*/List</*T2@*/T>) {}
+
+//T0 <: T1 due to 'PARAMETER'

nj2k/testData/inference/common/constructorCall.kt

@@ -0,0 +1,15 @@
+fun test() {
+    val x: /*T2@*/X</*T1@*/Int> = X</*T0@*/Int>(10/*LIT*/)/*X<T0@Int>*/
+    val x: /*T5@*/X</*T4@*/Int> = X</*T3@*/Int>(10/*LIT*/, 20/*LIT*/)/*X<T3@Int>*/
+}
+
+class X<T>(x: /*T6@*/T) {
+    constructor(x: /*T7@*/T, y: /*T8@*/Int): this(x/*T7@T*/)
+}
+
+//LOWER <: T0 due to 'PARAMETER'
+//T1 := T0 due to 'INITIALIZER'
+//LOWER <: T3 due to 'PARAMETER'
+//LOWER <: T8 due to 'PARAMETER'
+//T4 := T3 due to 'INITIALIZER'
+//T7 <: T6 due to 'PARAMETER'

nj2k/testData/inference/common/delegationConstructorCall.kt

@@ -0,0 +1,5 @@
+class X<T>(x: /*T0@*/T) {
+    constructor(x: /*T1@*/T, y: /*T2@*/Int): this(x/*T1@T*/)
+}
+
+//T1 <: T0 due to 'PARAMETER'

nj2k/testData/inference/common/elementOfArrayAssignment.kt

@@ -0,0 +1,14 @@
+fun test() {
+    val x: /*T4@*/Array</*T3@*/Array</*T2@*/Int>> = arrayOf</*T1@*/Array</*T0@*/Int>>()/*Array<T1@Array<T0@Int>>*/
+    val y: /*T6@*/Array</*T5@*/Int> = x/*T4@Array<T3@Array<T2@Int>>*/.get(0/*LIT*/)/*T3@Array<T2@Int>*/
+    val z: /*T7@*/Int = y/*T6@Array<T5@Int>*/.get(0/*LIT*/)/*T5@Int*/
+}
+
+//T2 := T0 due to 'INITIALIZER'
+//T3 := T1 due to 'INITIALIZER'
+//T2 := T2 due to 'RECEIVER_PARAMETER'
+//T3 := T3 due to 'RECEIVER_PARAMETER'
+//T5 := T2 due to 'INITIALIZER'
+//T3 <: T6 due to 'INITIALIZER'
+//T5 := T5 due to 'RECEIVER_PARAMETER'
+//T5 <: T7 due to 'INITIALIZER'

nj2k/testData/inference/common/elementOfListAssignment.kt

@@ -0,0 +1,14 @@
+fun test() {
+    val x: /*T4@*/List</*T3@*/List</*T2@*/Int>> = listOf</*T1@*/List</*T0@*/Int>>()/*List<T1@List<T0@Int>>*/
+    val y: /*T6@*/List</*T5@*/Int> = x/*T4@List<T3@List<T2@Int>>*/.get(0/*LIT*/)/*T3@List<T2@Int>*/
+    val z: /*T7@*/Int = y/*T6@List<T5@Int>*/.get(0/*LIT*/)/*T5@Int*/
+}
+
+//T0 <: T2 due to 'INITIALIZER'
+//T1 <: T3 due to 'INITIALIZER'
+//T2 <: T2 due to 'RECEIVER_PARAMETER'
+//T3 <: T3 due to 'RECEIVER_PARAMETER'
+//T2 <: T5 due to 'INITIALIZER'
+//T3 <: T6 due to 'INITIALIZER'
+//T5 <: T5 due to 'RECEIVER_PARAMETER'
+//T5 <: T7 due to 'INITIALIZER'

nj2k/testData/inference/common/forLoop.kt

@@ -0,0 +1,10 @@
+fun test() {
+    val x: /*T2@*/List</*T1@*/String> = listOf</*T0@*/String>()/*List<T0@String>*/
+    for (y: /*T3@*/String in x/*T2@List<T1@String>*/) {
+        val z: /*T4@*/String = x/*T2@List<T1@String>*/
+    }
+}
+
+//T0 <: T1 due to 'INITIALIZER'
+//T2 <: T4 due to 'INITIALIZER'
+//T3 <: T1 due to 'ASSIGNMENT'

nj2k/testData/inference/common/functionCall.kt

@@ -0,0 +1,10 @@
+fun test() {
+    val x: /*T1@*/List</*T0@*/Int> = nya()/*T3@List<T2@Int>*/
+}
+
+fun nya(): /*T3@*/List</*T2@*/Int> {
+    TODO()
+}
+
+//T2 <: T0 due to 'INITIALIZER'
+//T3 <: T1 due to 'INITIALIZER'

nj2k/testData/inference/common/functionReturn.kt

@@ -0,0 +1,7 @@
+fun f(): /*T1@*/Int {
+    val x: /*T0@*/Int = 42/*LIT*/
+    return x/*T0@Int*/
+}
+
+//LOWER <: T0 due to 'INITIALIZER'
+//T0 <: T1 due to 'RETURN'

nj2k/testData/inference/common/functionWithTypeParamCall.kt

@@ -0,0 +1,11 @@
+fun test() {
+    val x: /*T3@*/Map</*T1@*/String, /*T2@*/Int> = nya</*T0@*/String>()/*T6@Map<T0@String, T5@Int>*/
+}
+
+fun <T> nya(): /*T6@*/Map</*T4@*/T, /*T5@*/Int> {
+    TODO()
+}
+
+//T1 := T0 due to 'INITIALIZER'
+//T5 <: T2 due to 'INITIALIZER'
+//T6 <: T3 due to 'INITIALIZER'

nj2k/testData/inference/common/lambdaAsParameter.kt

@@ -0,0 +1,11 @@
+fun test() {
+    nya</*T2@*/Boolean>({ a: /*T0@*/Int, b: /*T1@*/Boolean -> ""/*LIT*/ }/*Function2<T0@Int, T1@Boolean, T7@String>*/)
+}
+
+fun <T> nya(x: /*T6@*/Function2</*T3@*/T, /*T4@*/Boolean, /*T5@*/String>) {
+}
+
+//LOWER <: T7 due to 'RETURN'
+//T2 <: T0 due to 'PARAMETER'
+//T4 <: T1 due to 'PARAMETER'
+//T7 <: T5 due to 'PARAMETER'

nj2k/testData/inference/common/lambdaAssign.kt

@@ -0,0 +1,8 @@
+fun test() {
+    val x: /*T5@*/Function2</*T2@*/Int, /*T3@*/String, /*T4@*/Boolean> = { a: /*T0@*/Int, b: /*T1@*/String -> true/*LIT*/ }/*Function2<T0@Int, T1@String, T6@Boolean>*/
+}
+
+//LOWER <: T6 due to 'RETURN'
+//T2 <: T0 due to 'INITIALIZER'
+//T3 <: T1 due to 'INITIALIZER'
+//T6 <: T4 due to 'INITIALIZER'

nj2k/testData/inference/common/lambdaImplicitReturn.kt

@@ -0,0 +1,12 @@
+fun test() {
+    val x: /*T6@*/Function2</*T3@*/Int, /*T4@*/String, /*T5@*/Boolean> = { a: /*T0@*/Int, b: /*T1@*/String ->
+        val a: /*T2@*/Boolean = true/*LIT*/
+        a/*T2@Boolean*/
+    }/*Function2<T0@Int, T1@String, T7@Boolean>*/
+}
+
+//LOWER <: T2 due to 'INITIALIZER'
+//T2 <: T7 due to 'RETURN'
+//T3 <: T0 due to 'INITIALIZER'
+//T4 <: T1 due to 'INITIALIZER'
+//T7 <: T5 due to 'INITIALIZER'

nj2k/testData/inference/common/lambdaReturn.kt

@@ -0,0 +1,21 @@
+class Test {
+    fun foo1(r: /*T2@*/Function1</*T0@*/Int, /*T1@*/String>) {}
+    fun foo() {
+        foo1 { i: /*T3@*/Int ->
+            val str: /*T4@*/String = ""/*LIT*/
+            val str2: /*T5@*/String = ""/*LIT*/
+
+            if (i > 1) {
+                return@foo1 str/*T4@String*/
+            }
+            str2/*T5@String*/
+        }/*Function1<T3@Int, T6@String>*/
+    }
+}
+
+//LOWER <: T4 due to 'INITIALIZER'
+//LOWER <: T5 due to 'INITIALIZER'
+//T4 <: T6 due to 'RETURN'
+//T5 <: T6 due to 'RETURN'
+//T0 <: T3 due to 'PARAMETER'
+//T6 <: T1 due to 'PARAMETER'

nj2k/testData/inference/common/listAssignment.kt

@@ -0,0 +1,8 @@
+fun test() {
+    val x: /*T2@*/List</*T1@*/Int> = listOf</*T0@*/Int>()/*List<T0@Int>*/
+    val y: /*T4@*/List</*T3@*/Int> = x/*T2@List<T1@Int>*/
+}
+
+//T0 <: T1 due to 'INITIALIZER'
+//T1 <: T3 due to 'INITIALIZER'
+//T2 <: T4 due to 'INITIALIZER'

nj2k/testData/inference/common/listGenerator.kt

@@ -0,0 +1,7 @@
+fun test() {
+    val x: /*T2@*/List</*T1@*/Int> = List</*T0@*/Int>(10/*LIT*/, { 10/*LIT*/ }/*Function0<Int, T3@Int>*/)/*List<T0@Int>*/
+}
+
+//LOWER <: T3 due to 'RETURN'
+//T3 <: T0 due to 'PARAMETER'
+//T0 <: T1 due to 'INITIALIZER'

nj2k/testData/inference/common/listOfLists.kt

@@ -0,0 +1,12 @@
+fun foo() {
+    val a: /*T5@*/List</*T4@*/List</*T3@*/Int>> = listOf</*T2@*/List</*T1@*/Int>>(
+        listOf</*T0@*/Int>(
+            1/*LIT*/
+        )/*List<T0@Int>*/
+    )/*List<T2@List<T1@Int>>*/
+}
+
+//LOWER <: T0 due to 'PARAMETER'
+//T0 <: T1 due to 'PARAMETER'
+//T1 <: T3 due to 'INITIALIZER'
+//T2 <: T4 due to 'INITIALIZER'

nj2k/testData/inference/common/listOfListsGenerator.kt

@@ -0,0 +1,16 @@
+fun test() {
+    val x: /*T5@*/List</*T4@*/List</*T3@*/Int>> = List</*T2@*/List</*T1@*/Int>>(13/*LIT*/, {
+             List</*T0@*/Int>(7/*LIT*/, {
+                 666/*LIT*/
+             }/*Function0<Int, T6@Int>*/)/*List<T0@Int>*/
+         }/*Function0<Int, T7@List<T8@Int>>*/
+    )/*List<T2@List<T1@Int>>*/
+}
+
+//LOWER <: T6 due to 'RETURN'
+//T6 <: T0 due to 'PARAMETER'
+//T0 <: T8 due to 'RETURN'
+//T8 <: T1 due to 'PARAMETER'
+//T7 <: T2 due to 'PARAMETER'
+//T1 <: T3 due to 'INITIALIZER'
+//T2 <: T4 due to 'INITIALIZER'

nj2k/testData/inference/common/memberCall.kt

@@ -0,0 +1,16 @@
+fun test() {
+    val x: /*T2@*/X</*T1@*/Int> = X</*T0@*/Int>()/*X<T0@Int>*/
+    val y: /*T5@*/Map</*T3@*/Int, /*T4@*/String> = x/*T2@X<T1@Int>*/.foo()/*T8@Map<T1@Int, T7@String>*/
+}
+
+class X<T> {
+    fun foo(): /*T8@*/Map</*T6@*/T, /*T7@*/String> {
+        TODO()
+    }
+}
+
+//T1 := T0 due to 'INITIALIZER'
+//T1 := T1 due to 'RECEIVER_PARAMETER'
+//T3 := T1 due to 'INITIALIZER'
+//T7 <: T4 due to 'INITIALIZER'
+//T8 <: T5 due to 'INITIALIZER'

nj2k/testData/inference/common/returnFromLambda.kt

@@ -0,0 +1,16 @@
+fun test() {
+    val x: /*T6@*/Function2</*T3@*/Int, /*T4@*/String, /*T5@*/Boolean> = l@{ a: /*T0@*/Int, b: /*T1@*/String ->
+        val y: /*T2@*/Boolean = true/*LIT*/
+        if (a == 3) {
+            return@l y/*T2@Boolean*/
+        }
+        true/*LIT*/
+    }/*Function2<T0@Int, T1@String, T7@Boolean>*//*Function2<T0@Int, T1@String, T7@Boolean>*/
+}
+
+//LOWER <: T2 due to 'INITIALIZER'
+//T2 <: T7 due to 'RETURN'
+//LOWER <: T7 due to 'RETURN'
+//T3 <: T0 due to 'INITIALIZER'
+//T4 <: T1 due to 'INITIALIZER'
+//T7 <: T5 due to 'INITIALIZER'

nj2k/testData/inference/common/sequenceOfCalls.kt

@@ -0,0 +1,9 @@
+fun a(lst: /*T1@*/List</*T0@*/String>) {
+    val newList: /*T5@*/List</*T4@*/String> = lst/*T1@List<T0@String>*/
+        .asSequence</*T2@*/String>()/*Sequence<T2@String>*/
+        .toList</*T3@*/String>()/*List<T3@String>*/
+}
+
+//T0 <: T2 due to 'RECEIVER_PARAMETER'
+//T2 <: T3 due to 'RECEIVER_PARAMETER'
+//T3 <: T4 due to 'INITIALIZER'

nj2k/testData/inference/common/sequenceOfCallsWIthLambda.kt

@@ -0,0 +1,14 @@
+fun a(lst: /*T1@*/List</*T0@*/String>) {
+    val newList: /*T8@*/List</*T7@*/Int> = lst/*T1@List<T0@String>*/
+        .asSequence</*T2@*/String>()/*Sequence<T2@String>*/
+        .map</*T4@*/String, /*T5@*/Int>({ x: /*T3@*/String -> 1/*LIT*/ }/*Function1<T3@String, T9@Int>*/)/*Sequence<T5@Int>*/
+        .toList</*T6@*/Int>()/*List<T6@Int>*/
+}
+
+//T0 <: T2 due to 'RECEIVER_PARAMETER'
+//LOWER <: T9 due to 'RETURN'
+//T2 <: T4 due to 'RECEIVER_PARAMETER'
+//T4 <: T3 due to 'PARAMETER'
+//T9 <: T5 due to 'PARAMETER'
+//T5 <: T6 due to 'RECEIVER_PARAMETER'
+//T6 <: T7 due to 'INITIALIZER'

nj2k/testData/inference/common/simpleAssignment.kt

@@ -0,0 +1,9 @@
+fun test() {
+    val x: /*T0@*/Int = 10/*LIT*/
+    val y: /*T1@*/Int = x/*T0@Int*/
+    val z: /*T2@*/Int = y/*T1@Int*/
+}
+
+//LOWER <: T0 due to 'INITIALIZER'
+//T0 <: T1 due to 'INITIALIZER'
+//T1 <: T2 due to 'INITIALIZER'

nj2k/testData/inference/common/superCall.kt

@@ -0,0 +1,14 @@
+open class A<T> {
+    open fun foo(x: /*T0@*/T, y: /*T2@*/List</*T1@*/T>) {
+    }
+}
+
+class B : A</*T6@*/Int>() {
+    override fun foo(x: /*T3@*/Int, y: /*T5@*/List</*T4@*/Int>) {
+        super/*LIT*/.foo(x/*T3@Int*/, y/*T5@List<T4@Int>*/)
+    }
+}
+
+//T3 := T6 due to 'SUPER_DECLARATION'
+//T4 := T6 due to 'SUPER_DECLARATION'
+//T2 := T5 due to 'SUPER_DECLARATION'

nj2k/testData/inference/common/superConstuctorCall.kt

@@ -0,0 +1,7 @@
+open class X<T>(x: /*T0@*/T) {
+}
+
+class Y<T>(x: /*T1@*/T) : X</*T2@*/T>(x/*T1@T*/) {
+}
+
+//T1 <: T0 due to 'PARAMETER'

nj2k/testData/inference/common/superFunctionReturnTypeWithTypeParameters.kt

@@ -0,0 +1,15 @@
+interface A<T, S> {
+    fun foo(): /*T3@*/List</*T2@*/Map</*T0@*/T, /*T1@*/S>>
+}
+
+
+open class B<X> : A</*T8@*/X, /*T9@*/Int> {
+    override fun foo(): /*T7@*/List</*T6@*/Map</*T4@*/X, /*T5@*/Int>> {
+        TODO()
+    }
+}
+
+//T4 := T8 due to 'SUPER_DECLARATION'
+//T5 := T9 due to 'SUPER_DECLARATION'
+//T2 := T6 due to 'SUPER_DECLARATION'
+//T3 := T7 due to 'SUPER_DECLARATION'

nj2k/testData/inference/common/superFunctionReturnTypeWithTypeParametersSubstitution.kt

@@ -0,0 +1,13 @@
+open class A<T> {
+    open fun foo(): /*T0@*/T {
+        TODO()
+    }
+}
+
+class B<T> : A</*T2@*/Int>() {
+    override fun foo(): /*T1@*/Int {
+        TODO()
+    }
+}
+
+//T1 := T2 due to 'SUPER_DECLARATION'

nj2k/testData/inference/common/superFunctionType.kt

@@ -0,0 +1,13 @@
+open class A {
+    open fun foo(): /*T0@*/String {
+        TODO()
+    }
+}
+
+class B : A() {
+    override fun foo(): /*T1@*/String {
+        TODO()
+    }
+}
+
+//T0 := T1 due to 'SUPER_DECLARATION'

nj2k/testData/inference/common/typeParamsBounds.kt

@@ -0,0 +1,5 @@
+class Test {
+    fun <X : /*T0@*/Any> x() {
+    }
+}
+

nj2k/testData/inference/common/varargsInCall.kt

@@ -0,0 +1,14 @@
+fun test() {
+    val x: /*T0@*/String = ""/*LIT*/
+    val y: /*T1@*/String = ""/*LIT*/
+    val z: /*T2@*/String = ""/*LIT*/
+    val e: /*T5@*/List</*T4@*/String> = listOf</*T3@*/String>(x/*T0@String*/, y/*T1@String*/, z/*T2@String*/)/*List<T3@String>*/
+}
+
+//LOWER <: T0 due to 'INITIALIZER'
+//LOWER <: T1 due to 'INITIALIZER'
+//LOWER <: T2 due to 'INITIALIZER'
+//T0 <: T3 due to 'PARAMETER'
+//T1 <: T3 due to 'PARAMETER'
+//T2 <: T3 due to 'PARAMETER'
+//T3 <: T4 due to 'INITIALIZER'

nj2k/testData/inference/nullability/arrayOfArraysOfNull.kt

@@ -0,0 +1,10 @@
+class Test {
+    fun foo() {
+        val ss = Array</*T2@*/Array</*T1@*/String?>>(5/*LIT*/, { arrayOfNulls</*T0@*/String?>(5/*LIT*/)/*Array<T0@String!!U>!!L*/ }/*Function0<Int, T3@Array<T4@String>>!!L*/)
+    }
+}
+
+//T4 := UPPER due to 'RETURN'
+//LOWER <: T3 due to 'RETURN'
+//T1 := T4 due to 'PARAMETER'
+//T3 <: T2 due to 'PARAMETER'

nj2k/testData/inference/nullability/arrayOfNulls.kt

@@ -0,0 +1,6 @@
+fun test() {
+    val x: /*T2@*/Array</*T1@*/Int?> = arrayOfNulls</*T0@*/Int?>(10/*LIT*/)/*Array<T0@Int!!U>!!L*/
+}
+
+//T1 := UPPER due to 'INITIALIZER'
+//LOWER <: T2 due to 'INITIALIZER'

nj2k/testData/inference/nullability/binaryExpressionOperand.kt

@@ -0,0 +1,7 @@
+fun test() {
+    val x: /*T0@*/Int = 10/*LIT*/
+    x/*T0@Int*/ > 0/*LIT*/
+}
+
+//LOWER <: T0 due to 'INITIALIZER'
+//T0 := LOWER due to 'USE_AS_RECEIVER'

nj2k/testData/inference/nullability/callExternallyAnnotatedJavaFunction.kt

@@ -0,0 +1,11 @@
+import java.util.Arrays.asList
+
+fun test() {
+    val x: /*T2@*/List</*T1@*/Int> = asList</*T0@*/Int>(1/*LIT*/)/*MutableList<T0@Int>!!L*/
+    val i: /*T3@*/Int = Integer/*LIT*/.valueOf(""/*LIT*/)/*Int!!L*/
+}
+
+//LOWER <: T0 due to 'PARAMETER'
+//T1 := T0 due to 'INITIALIZER'
+//LOWER <: T2 due to 'INITIALIZER'
+//LOWER <: T3 due to 'INITIALIZER'

nj2k/testData/inference/nullability/classTypeParameters.kt

@@ -0,0 +1,27 @@
+open class A<T> {
+    open fun foo(): /*T3@*/Map</*T0@*/T, /*T2@*/List</*T1@*/T>>? {
+        TODO()
+    }
+
+    open fun bar(): /*T4@*/T? {
+        return null/*NULL!!U*/
+    }
+}
+
+class B : A</*T10@*/Int>() {
+    override fun foo(): /*T8@*/Map</*T5@*/Int, /*T7@*/List</*T6@*/Int>>? {
+        return null/*NULL!!U*/
+    }
+    override fun bar(): /*T9@*/Int {
+        return 42/*LIT*/
+    }
+}
+
+//UPPER <: T4 due to 'RETURN'
+//UPPER <: T8 due to 'RETURN'
+//T5 := T10 due to 'SUPER_DECLARATION'
+//T6 := T10 due to 'SUPER_DECLARATION'
+//T2 := T7 due to 'SUPER_DECLARATION'
+//T3 := T8 due to 'SUPER_DECLARATION'
+//LOWER <: T9 due to 'RETURN'
+//T9 := T10 due to 'SUPER_DECLARATION'

nj2k/testData/inference/nullability/compareWithNull.kt

@@ -0,0 +1,19 @@
+fun a(): /*T0@*/Int? {
+    return 42/*LIT*/
+}
+
+val b: /*T1@*/Int? = 2/*LIT*/
+
+fun c(p: /*T2@*/Int?) {
+    if (p/*T2@Int*/ == null/*LIT*/);
+}
+
+fun check() {
+    if (a()/*T0@Int*/ == null/*LIT*/ || b/*T1@Int*/ == null/*LIT*//*LIT*/);
+}
+
+//LOWER <: T0 due to 'RETURN'
+//LOWER <: T1 due to 'INITIALIZER'
+//T2 := UPPER due to 'COMPARE_WITH_NULL'
+//T0 := UPPER due to 'COMPARE_WITH_NULL'
+//T1 := UPPER due to 'COMPARE_WITH_NULL'

nj2k/testData/inference/nullability/forcedNullability.kt

@@ -0,0 +1,9 @@
+fun b(m: /*T2@*/Map</*T0@*/Int, /*T1@*/String>): /*T3@*/String? {
+    return m/*T2@Map<T0@Int, T1@String>*/.get(42/*LIT*/)/*T1@String!!U*/
+}
+
+//T0 := T0 due to 'RECEIVER_PARAMETER'
+//T1 <: T1 due to 'RECEIVER_PARAMETER'
+//LOWER <: T0 due to 'PARAMETER'
+//T2 := LOWER due to 'USE_AS_RECEIVER'
+//UPPER <: T3 due to 'RETURN'

nj2k/testData/inference/nullability/functionTypeParameterNullability.kt

@@ -0,0 +1,20 @@
+fun <T, E, F, S> foo(x: /*T0@*/T, y: /*T2@*/List</*T1@*/E>, z: /*T4@*/List</*T3@*/F>, a: /*T5@*/S) {}
+
+fun bar() {
+    val lst: /*T8@*/List</*T7@*/Int?> = listOf</*T6@*/Int?>(null/*NULL!!U*/)/*List<T6@Int>!!L*/
+    val lst2: /*T11@*/List</*T10@*/Int> = listOf</*T9@*/Int>(1/*LIT*/)/*List<T9@Int>!!L*/
+    foo</*T12@*/Int?, /*T13@*/Int?, /*T14@*/Int, /*T15@*/String>(null/*NULL!!U*/, lst/*T8@List<T7@Int>*/, lst2/*T11@List<T10@Int>*/, "nya"/*LIT*/)
+}
+
+//UPPER <: T6 due to 'PARAMETER'
+//T6 <: T7 due to 'INITIALIZER'
+//LOWER <: T8 due to 'INITIALIZER'
+//LOWER <: T9 due to 'PARAMETER'
+//T9 <: T10 due to 'INITIALIZER'
+//LOWER <: T11 due to 'INITIALIZER'
+//UPPER <: T12 due to 'PARAMETER'
+//T7 <: T13 due to 'PARAMETER'
+//T8 <: T2 due to 'PARAMETER'
+//T10 <: T14 due to 'PARAMETER'
+//T11 <: T4 due to 'PARAMETER'
+//LOWER <: T15 due to 'PARAMETER'

nj2k/testData/inference/nullability/functions.kt

@@ -0,0 +1,40 @@
+fun notNullParameters(f: /*T3@*/Function2</*T0@*/Int, /*T1@*/Int, /*T2@*/String>) {}
+fun nullableParameter(f: /*T7@*/Function2</*T4@*/Int?, /*T5@*/Int, /*T6@*/String>) {}
+fun nullableReturnType(f: /*T11@*/Function2</*T8@*/Int, /*T9@*/Int, /*T10@*/String?>) {}
+
+
+fun test() {
+    notNullParameters({ i: /*T12@*/Int, j: /*T13@*/Int ->
+                          if (i/*T12@Int*/ < 10/*LIT*//*LIT*/ && j/*T13@Int*/ > 0/*LIT*//*LIT*//*LIT*/) ""/*LIT*/ else ""/*LIT*/
+                      }/*Function2<T12@Int, T13@Int, T18@String>!!L*/)
+
+    nullableParameter({ i: /*T14@*/Int?, j: /*T15@*/Int ->
+                          if (i/*T14@Int*/ == null/*LIT*/) ""/*LIT*/ else ""/*LIT*/
+                      }/*Function2<T14@Int, T15@Int, T19@String>!!L*/)
+
+    nullableReturnType({ i: /*T16@*/Int, j: /*T17@*/Int ->
+                           if (i/*T16@Int*/ < 10/*LIT*//*LIT*/) return@nullableReturnType null/*NULL!!U*/
+                           return@nullableReturnType "nya"/*LIT*/
+                       }/*Function2<T16@Int, T17@Int, T20@String>!!L*/)
+}
+
+//T12 := LOWER due to 'USE_AS_RECEIVER'
+//T13 := LOWER due to 'USE_AS_RECEIVER'
+//LOWER <: T18 due to 'RETURN'
+//T0 <: T12 due to 'PARAMETER'
+//T1 <: T13 due to 'PARAMETER'
+//T18 <: T2 due to 'PARAMETER'
+//LOWER <: T3 due to 'PARAMETER'
+//T14 := UPPER due to 'COMPARE_WITH_NULL'
+//LOWER <: T19 due to 'RETURN'
+//T4 <: T14 due to 'PARAMETER'
+//T5 <: T15 due to 'PARAMETER'
+//T19 <: T6 due to 'PARAMETER'
+//LOWER <: T7 due to 'PARAMETER'
+//T16 := LOWER due to 'USE_AS_RECEIVER'
+//UPPER <: T20 due to 'RETURN'
+//LOWER <: T20 due to 'RETURN'
+//T8 <: T16 due to 'PARAMETER'
+//T9 <: T17 due to 'PARAMETER'
+//T20 <: T10 due to 'PARAMETER'
+//LOWER <: T11 due to 'PARAMETER'

nj2k/testData/inference/nullability/ifCondition.kt

@@ -0,0 +1,5 @@
+fun test(a: /*T0@*/Boolean) {
+    if (a/*T0@Boolean*/) {}
+}
+
+//T0 := LOWER due to 'USE_AS_RECEIVER'

nj2k/testData/inference/nullability/javaStream.kt

@@ -0,0 +1,25 @@
+// RUNTIME_WITH_FULL_JDK
+
+import java.util.stream.Collector
+import java.util.stream.Collectors
+import java.util.stream.Stream
+
+fun test(list: /*T1@*/List</*T0@*/String>) {
+    val x: /*T9@*/List</*T8@*/String> = list/*T1@List<T0@String>*/.stream()/*Stream<T0@String>!!L*/
+        .map</*T3@*/String>({ x: /*T2@*/String -> x/*T2@String*/ + ""/*LIT*//*LIT*/ }/*Function1<T2@String, T10@String>!!L*/)/*Stream<T3@String>*/
+        .collect</*T6@*/List</*T5@*/String>, /*T7@*/Any?>(Collectors/*LIT*/.toList</*T4@*/String>()/*Collector<T4@String, Any, MutableList<T4@String>>*/)/*T6@List<T5@String>*/
+
+}
+
+//T0 <: T0 due to 'RECEIVER_PARAMETER'
+//T1 := LOWER due to 'USE_AS_RECEIVER'
+//T2 := LOWER due to 'USE_AS_RECEIVER'
+//LOWER <: T10 due to 'RETURN'
+//T0 := T0 due to 'RECEIVER_PARAMETER'
+//T0 <: T2 due to 'PARAMETER'
+//T10 <: T3 due to 'PARAMETER'
+//T3 := T3 due to 'RECEIVER_PARAMETER'
+//T3 := T4 due to 'PARAMETER'
+//T5 := T4 due to 'PARAMETER'
+//T5 <: T8 due to 'INITIALIZER'
+//T6 <: T9 due to 'INITIALIZER'

nj2k/testData/inference/nullability/lambdaReturnNull.kt

@@ -0,0 +1,23 @@
+class Test {
+    fun foo1(r: /*T2@*/Function1</*T0@*/Int, /*T1@*/String?>) {}
+    fun foo() {
+        foo1({ x: /*T3@*/Int -> ""/*LIT*/ }/*Function1<T3@Int, T5@String>!!L*/)
+        foo1({ i: /*T4@*/Int ->
+                 if (i/*T4@Int*/ > 1/*LIT*//*LIT*/) {
+                     return@foo1 null/*NULL!!U*/
+                 }
+                 ""/*LIT*/
+             }/*Function1<T4@Int, T6@String>!!L*/)
+    }
+}
+
+//LOWER <: T5 due to 'RETURN'
+//T0 <: T3 due to 'PARAMETER'
+//T5 <: T1 due to 'PARAMETER'
+//LOWER <: T2 due to 'PARAMETER'
+//T4 := LOWER due to 'USE_AS_RECEIVER'
+//UPPER <: T6 due to 'RETURN'
+//LOWER <: T6 due to 'RETURN'
+//T0 <: T4 due to 'PARAMETER'
+//T6 <: T1 due to 'PARAMETER'
+//LOWER <: T2 due to 'PARAMETER'

nj2k/testData/inference/nullability/listOfWithNullLiteral.kt

@@ -0,0 +1,9 @@
+fun test() {
+    val x: /*T2@*/List</*T1@*/Int?> = listOf</*T0@*/Int?>(1/*LIT*/, null/*NULL!!U*/, 3/*LIT*/)/*List<T0@Int>!!L*/
+}
+
+//LOWER <: T0 due to 'PARAMETER'
+//UPPER <: T0 due to 'PARAMETER'
+//LOWER <: T0 due to 'PARAMETER'
+//T0 <: T1 due to 'INITIALIZER'
+//LOWER <: T2 due to 'INITIALIZER'

nj2k/testData/inference/nullability/loopIterator.kt

@@ -0,0 +1,8 @@
+fun test(a: /*T1@*/List</*T0@*/Int>) {
+    for (i: /*T2@*/Int in a/*T1@List<T0@Int>*/) {
+
+    }
+}
+
+//T2 <: T0 due to 'ASSIGNMENT'
+//T1 := LOWER due to 'USE_AS_RECEIVER'

nj2k/testData/inference/nullability/loops.kt

@@ -0,0 +1,31 @@
+fun bar(map: /*T2@*/HashMap</*T0@*/String?, /*T1@*/Int>, list1: /*T4@*/List</*T3@*/Int>, list2: /*T6@*/List</*T5@*/String?>) {
+    for (entry: /*T9@*/MutableMap.MutableEntry</*T7@*/String?, /*T8@*/Int> in map/*T2@HashMap<T0@String, T1@Int>*/.entries/*MutableSet<MutableEntry<T0@String, T1@Int>>*/) {
+        val value: /*T10@*/Int = entry/*T9@MutableEntry<T7@String, T8@Int>*/.value/*T8@Int*/
+        if (entry/*T9@MutableEntry<T7@String, T8@Int>*/.key/*T7@String*/ == null/*LIT*/) {
+            println(value/*T10@Int*/ + 1/*LIT*//*LIT*/)
+        }
+    }
+
+    for (i: /*T11@*/Int in list1/*T4@List<T3@Int>*/) {
+        i/*T11@Int*/ + 1/*LIT*/
+    }
+
+    for (i: /*T12@*/String? in list2/*T6@List<T5@String>*/) {
+        i/*T12@String*/ == null
+    }
+}
+
+//T2 := LOWER due to 'USE_AS_RECEIVER'
+//T9 := LOWER due to 'USE_AS_RECEIVER'
+//T8 <: T10 due to 'INITIALIZER'
+//T9 := LOWER due to 'USE_AS_RECEIVER'
+//T7 := UPPER due to 'COMPARE_WITH_NULL'
+//T10 := LOWER due to 'USE_AS_RECEIVER'
+//T0 := T7 due to 'ASSIGNMENT'
+//T1 := T8 due to 'ASSIGNMENT'
+//T11 := LOWER due to 'USE_AS_RECEIVER'
+//T11 <: T3 due to 'ASSIGNMENT'
+//T4 := LOWER due to 'USE_AS_RECEIVER'
+//T12 := UPPER due to 'COMPARE_WITH_NULL'
+//T12 <: T5 due to 'ASSIGNMENT'
+//T6 := LOWER due to 'USE_AS_RECEIVER'

nj2k/testData/inference/nullability/notNullCallSequence.kt

@@ -0,0 +1,16 @@
+// RUNTIME_WITH_FULL_JDK
+
+fun main() {
+    val list: /*T5@*/List</*T4@*/String?> =
+        listOf</*T0@*/String?>(""/*LIT*/, null/*NULL!!U*/)/*List<T0@String>!!L*/
+            .map</*T2@*/String?, /*T3@*/String?>({ x: /*T1@*/String? -> x/*T1@String*/ }/*Function1<T1@String, T6@String>!!L*/)/*List<T3@String>!!L*/
+}
+
+//LOWER <: T0 due to 'PARAMETER'
+//UPPER <: T0 due to 'PARAMETER'
+//T1 <: T6 due to 'RETURN'
+//T0 <: T2 due to 'RECEIVER_PARAMETER'
+//T2 <: T1 due to 'PARAMETER'
+//T6 <: T3 due to 'PARAMETER'
+//T3 <: T4 due to 'INITIALIZER'
+//LOWER <: T5 due to 'INITIALIZER'

nj2k/testData/inference/nullability/nullAsAssignment.kt

@@ -0,0 +1,18 @@
+fun test() {
+    var x: /*T0@*/Int? = 1/*LIT*/
+    x/*T0@Int*/ = null/*NULL!!U*/
+
+    var y: /*T1@*/Int? = 5/*LIT*/
+    y/*T1@Int*/ = nullableFun()/*T2@Int*/
+}
+
+fun nullableFun(): /*T2@*/Int? {
+    return null/*NULL!!U*/
+}
+
+//LOWER <: T0 due to 'INITIALIZER'
+//UPPER <: T0 due to 'ASSIGNMENT'
+//T0 := UPPER due to 'COMPARE_WITH_NULL'
+//LOWER <: T1 due to 'INITIALIZER'
+//T2 <: T1 due to 'ASSIGNMENT'
+//UPPER <: T2 due to 'RETURN'

nj2k/testData/inference/nullability/nullAsInitializer.kt

@@ -0,0 +1,5 @@
+val x: /*T0@*/Int? = null/*NULL!!U*/
+fun foo(p: /*T1@*/Int? = null/*NULL!!U*/) {}
+
+//UPPER <: T0 due to 'INITIALIZER'
+//UPPER <: T1 due to 'INITIALIZER'

nj2k/testData/inference/nullability/nullLiteral.kt

@@ -0,0 +1,5 @@
+fun test() {
+    val x: /*T0@*/Int? = null/*NULL!!U*/
+}
+
+//UPPER <: T0 due to 'INITIALIZER'

nj2k/testData/inference/nullability/returnNull.kt

@@ -0,0 +1,5 @@
+fun nya() : /*T0@*/Int? {
+    return null/*NULL!!U*/
+}
+
+//UPPER <: T0 due to 'RETURN'

nj2k/testData/inference/nullability/sequenceOfCallsWIthLambda.kt

@@ -0,0 +1,16 @@
+fun a(lst: /*T1@*/List</*T0@*/String>) {
+    val newList: /*T8@*/List</*T7@*/Int> = lst/*T1@List<T0@String>*/
+        .asSequence</*T2@*/String>()/*Sequence<T2@String>!!L*/
+        .map</*T4@*/String, /*T5@*/Int>({ x: /*T3@*/String -> 1/*LIT*/ }/*Function1<T3@String, T9@Int>!!L*/)/*Sequence<T5@Int>!!L*/
+        .toList</*T6@*/Int>()/*List<T6@Int>!!L*/
+}
+
+//T0 <: T2 due to 'RECEIVER_PARAMETER'
+//T1 := LOWER due to 'USE_AS_RECEIVER'
+//LOWER <: T9 due to 'RETURN'
+//T2 <: T4 due to 'RECEIVER_PARAMETER'
+//T4 <: T3 due to 'PARAMETER'
+//T9 <: T5 due to 'PARAMETER'
+//T5 <: T6 due to 'RECEIVER_PARAMETER'
+//T6 <: T7 due to 'INITIALIZER'
+//LOWER <: T8 due to 'INITIALIZER'

nj2k/testData/inference/nullability/smartCast.kt

@@ -0,0 +1,7 @@
+fun foo(o: /*T0@*/Int??) {
+    if (o/*T0@Int*/ == null/*LIT*/) return
+    val a: /*T1@*/Int = o/*T0@Int!!L*/
+}
+
+//T0 := UPPER due to 'COMPARE_WITH_NULL'
+//LOWER <: T1 due to 'INITIALIZER'

nj2k/testData/inference/nullability/spreadExpression.kt

@@ -0,0 +1,9 @@
+import java.lang.reflect.Constructor
+
+fun <T> foo(constructor: /*T1@*/Constructor</*T0@*/T>, args: /*T3@*/Array</*T2@*/Any?>) {
+    constructor/*T1@Constructor<T0@T>*/.newInstance(*args/*T3@Array<T2@Any>*/)
+}
+
+//T3 := LOWER due to 'USE_AS_RECEIVER'
+//T0 := T0 due to 'RECEIVER_PARAMETER'
+//T1 := LOWER due to 'USE_AS_RECEIVER'

nj2k/testData/inference/nullability/superMethod.kt

@@ -0,0 +1,18 @@
+open class A () {
+    open fun foo(x: /*T0@*/Int?): /*T1@*/Int? {
+        if (x/*T0@Int*/ == null/*LIT*/);
+        return null/*NULL!!U*/
+    }
+}
+
+class B : A() {
+    override fun foo(x: /*T2@*/Int?): /*T3@*/Int? {
+        return 1/*LIT*/
+    }
+}
+
+//T0 := UPPER due to 'COMPARE_WITH_NULL'
+//UPPER <: T1 due to 'RETURN'
+//LOWER <: T3 due to 'RETURN'
+//T1 := T3 due to 'SUPER_DECLARATION'
+//T0 := T2 due to 'SUPER_DECLARATION'

nj2k/testData/inference/nullability/typeCast.kt

@@ -0,0 +1,18 @@
+fun foo() {
+    val cast1: /*T1@*/Int = 1/*LIT*/ as /*T0@*/Int/*T0@Int*/
+    val cast2: /*T3@*/Int? = null/*NULL!!U*/ as /*T2@*/Int?/*T2@Int*/
+    val cast3: /*T5@*/Float = (1/*LIT*/ as /*T4@*/Int/*T4@Int*/)/*T4@Int*/.toFloat()/*Float!!L*/
+    val nya: /*T6@*/Int? = null/*NULL!!U*/
+    val cast4: /*T8@*/Int? = nya/*T6@Int*/ as /*T7@*/Int?/*T7@Int*/
+}
+
+//LOWER <: T0 due to 'ASSIGNMENT'
+//T0 <: T1 due to 'INITIALIZER'
+//UPPER <: T2 due to 'ASSIGNMENT'
+//T2 <: T3 due to 'INITIALIZER'
+//LOWER <: T4 due to 'ASSIGNMENT'
+//T4 := LOWER due to 'USE_AS_RECEIVER'
+//LOWER <: T5 due to 'INITIALIZER'
+//UPPER <: T6 due to 'INITIALIZER'
+//T6 <: T7 due to 'ASSIGNMENT'
+//T7 <: T8 due to 'INITIALIZER'

nj2k/testData/inference/nullability/typeParameters.kt

@@ -0,0 +1,20 @@
+fun foo() {
+    val a: /*T5@*/List</*T4@*/List</*T3@*/Int>> = listOf</*T2@*/List</*T1@*/Int>>(
+        listOf</*T0@*/Int>(
+            1/*LIT*/
+        )/*List<T0@Int>!!L*/
+    )/*List<T2@List<T1@Int>>!!L*/
+    val b: /*T7@*/List</*T6@*/Int> = a/*T5@List<T4@List<T3@Int>>*/.get(0/*LIT*/)/*T4@List<T3@Int>*/
+}
+
+//LOWER <: T0 due to 'PARAMETER'
+//T0 <: T1 due to 'PARAMETER'
+//LOWER <: T2 due to 'PARAMETER'
+//T1 <: T3 due to 'INITIALIZER'
+//T2 <: T4 due to 'INITIALIZER'
+//LOWER <: T5 due to 'INITIALIZER'
+//T3 <: T3 due to 'RECEIVER_PARAMETER'
+//T4 <: T4 due to 'RECEIVER_PARAMETER'
+//T5 := LOWER due to 'USE_AS_RECEIVER'
+//T3 <: T6 due to 'INITIALIZER'
+//T4 <: T7 due to 'INITIALIZER'

nj2k/testData/inference/nullability/typeParametersReturnType.kt

@@ -0,0 +1,20 @@
+open class A<T> {
+    open fun foo(): /*T3@*/Map</*T0@*/T, /*T2@*/List</*T1@*/T>> {
+        TODO()
+    }
+
+    open fun bar(): /*T4@*/T {
+        TODO()
+    }
+}
+
+class B : A</*T9@*/Int>() {
+    override fun foo(): /*T8@*/Map</*T5@*/Int, /*T7@*/List</*T6@*/Int>> {
+        TODO()
+    }
+}
+
+//T5 := T9 due to 'SUPER_DECLARATION'
+//T6 := T9 due to 'SUPER_DECLARATION'
+//T2 := T7 due to 'SUPER_DECLARATION'
+//T3 := T8 due to 'SUPER_DECLARATION'

nj2k/testData/inference/nullability/typeParametersValueParams.kt

@@ -0,0 +1,16 @@
+open class A<T> {
+    open fun foo(x: /*T1@*/List</*T0@*/T>, y: /*T2@*/Boolean, z: /*T3@*/T) {
+        TODO()
+    }
+}
+
+class B : A</*T8@*/Int>() {
+    override fun foo(x: /*T5@*/List</*T4@*/Int>, y: /*T6@*/Boolean, z: /*T7@*/Int) {
+        TODO()
+    }
+}
+
+//T4 := T8 due to 'SUPER_DECLARATION'
+//T1 := T5 due to 'SUPER_DECLARATION'
+//T2 := T6 due to 'SUPER_DECLARATION'
+//T7 := T8 due to 'SUPER_DECLARATION'

nj2k/testData/inference/nullability/useAsReceiver.kt

@@ -0,0 +1,9 @@
+fun test() {
+    val x: /*T2@*/List</*T1@*/Any> = listOf</*T0@*/Any>()/*List<T0@Any>!!L*/
+    x/*T2@List<T1@Any>*/.get(0/*LIT*/)
+}
+
+//T0 <: T1 due to 'INITIALIZER'
+//LOWER <: T2 due to 'INITIALIZER'
+//T1 <: T1 due to 'RECEIVER_PARAMETER'
+//T2 := LOWER due to 'USE_AS_RECEIVER'

nj2k/testData/inference/nullability/whileCondition.kt

@@ -0,0 +1,5 @@
+fun test(a: /*T0@*/Boolean) {
+    while (a/*T0@Boolean*/) {}
+}
+
+//T0 := LOWER due to 'USE_AS_RECEIVER'

nj2k/testData/newJ2k/arrayAccessExpression/expressionIndex.kt

@@ -1 +1 @@
-myArray[myLibrary.calculateIndex(100)]
+myArray.get(myLibrary.calculateIndex(100))

nj2k/testData/newJ2k/arrayAccessExpression/intIndex.kt

@@ -1 +1 @@
-myArray[10]
+myArray.get(10)

nj2k/testData/newJ2k/arrayAccessExpression/variableIndex.kt

@@ -1 +1 @@
-myArray[i]
+myArray.get(i)

nj2k/testData/newJ2k/arrayInitializerExpression/objectArrayWithLength.kt

@@ -1 +1 @@
-val a = arrayOfNulls<Any>(10)
+val a = arrayOfNulls<Any?>(10)

nj2k/testData/newJ2k/arrayType/arrayInitializationStatementWithDimension.kt

@@ -1 +1 @@
-val d2 = arrayOfNulls<IntArray>(5)
+val d2 = arrayOfNulls<IntArray?>(5)

nj2k/testData/newJ2k/arrayType/arrayInitializationStatementWithDimension3d.kt

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

nj2k/testData/newJ2k/arrayType/d2StringEmptyArray.kt

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

nj2k/testData/newJ2k/arrayType/d3StringEmptyArray.kt

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

nj2k/testData/newJ2k/boxedType/kt-671.kt

@@ -1,6 +1,6 @@
 internal class Test {
     fun test() {
-        val i = Integer.valueOf(100)
+        val i: Int? = Integer.valueOf(100)
         val s: Short = 3
         val ss = s
     }

nj2k/testData/newJ2k/class/ClassShadowing.kt

@@ -1,6 +1,6 @@
 package test
 
-class Integer(s: String?) {
+class Integer(s: String) {
     companion object {
         fun valueOf(value: String): Integer {
             return Integer(value)

nj2k/testData/newJ2k/class/kt-639.kt

@@ -4,15 +4,14 @@ import java.util.HashMap
 
 internal class Test {
     constructor() {}
-    constructor(s: String?) {}
+    constructor(s: String) {}
 }
 
 internal class User {
     fun main() {
         val m: HashMap<*, *> = HashMap<Any?, Any?>(1)
         val m2: HashMap<*, *> = HashMap<Any?, Any?>(10)
-
         val t1 = Test()
         val t2 = Test("")
     }
-}
+}

nj2k/testData/newJ2k/constructors/fieldsInitializedFromParams8.kt

@@ -1,3 +1,2 @@
-internal open class Base(o: Any?, l: Int)
-
-internal class C(private val string: String) : Base(string, string.length)
+internal open class Base(o: Any, l: Int)
+internal class C(private val string: String) : Base(string, string.length)

nj2k/testData/newJ2k/constructors/genericIdentifier.kt

@@ -17,12 +17,13 @@ class Identifier<T> {
         myHasDollar = hasDollar
         myNullable = isNullable
     }
+
 }
 
 object User {
     fun main() {
-        val i1: Identifier<*> = Identifier<String?>("name", false, true)
-        val i2: Identifier<*> = Identifier<String?>("name", false)
-        val i3: Identifier<*> = Identifier<String?>("name")
+        val i1: Identifier<*> = Identifier("name", false, true)
+        val i2: Identifier<*> = Identifier("name", false)
+        val i3: Identifier<*> = Identifier("name")
     }
 }

nj2k/testData/newJ2k/constructors/nestedClassNameInSuperParameters.kt

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

nj2k/testData/newJ2k/detectProperties/OverridesOfExternalCode.kt

@@ -82,9 +82,9 @@ internal class C : A() {
 }
 
 internal class D : JavaClassDerivedFromKotlinClassWithProperties() {
-    override fun getSomeVar1(): String? {
+    override fun getSomeVar1(): String {
         return "a"
     }
 
-    override fun setSomeVar2(value: String?) {}
+    override fun setSomeVar2(value: String) {}
 }

nj2k/testData/newJ2k/function/externalKtFunctionalInterface.kt

@@ -11,6 +11,6 @@ internal class Test {
     fun nya(): Double {
         //TODO explicitlly call apply here
 
-        return foo(1, FunctionalI<Int, Double> { x: Int -> this.toDouble(x) })
+        return foo(1, FunctionalI<Int?, Double?> { x: Int -> this.toDouble(x) })
     }
 }

nj2k/testData/newJ2k/function/internalFunctionalInterface.kt

@@ -1,4 +1,3 @@
-// ERROR: Type mismatch: inferred type is B? but B was expected
 // ERROR: Unresolved reference: A
 // ERROR: Interface FunctionalI does not have constructors
 internal interface FunctionalI<A, B> {
@@ -6,7 +5,7 @@ internal interface FunctionalI<A, B> {
 }
 
 internal class Test {
-    fun <A, B> foo(value: A, `fun`: FunctionalI<A?, B?>): B {
+    fun <A, B> foo(value: A, `fun`: FunctionalI<A, B>): B {
         return `fun`.apply(value)
     }
 
@@ -15,6 +14,6 @@ internal class Test {
     }
 
     fun nya(): Double {
-        return foo(1, FunctionalI<Int, Double> { x: A -> this.toDouble(x) })
+        return foo(1, FunctionalI<Int?, Double?> { x: A -> this.toDouble(x) })
     }
 }

nj2k/testData/newJ2k/function/ownGenericParam.kt

@@ -1 +1 @@
-fun <U> putU(u: U?) {}
+fun <U> putU(u: U) {}

nj2k/testData/newJ2k/function/ownSeveralGenericParams.kt

@@ -1 +1 @@
-fun <U, V, W> putUVW(u: U?, v: V?, w: W?) {}
+fun <U, V, W> putUVW(u: U, v: V, w: W) {}

nj2k/testData/newJ2k/inheritance/classOneExtendsBaseGeneric.kt

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

nj2k/testData/newJ2k/inheritance/classOneExtendsBaseWithOneParam.kt

@@ -1,3 +1,2 @@
-internal open class Base(name: String?)
-
-internal class One(name: String?, second: String?) : Base(name)
+internal open class Base(name: String)
+internal class One(name: String, second: String?) : Base(name)

nj2k/testData/newJ2k/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.kt

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

nj2k/testData/newJ2k/issues/kt-1048.kt

@@ -3,7 +3,7 @@
 // ERROR: Type argument is not within its bounds: should be subtype of 'String?'
 import java.util.HashMap
 
-internal class G<T : String?>(t: T?)
+internal class G<T : String?>(t: T)
 class Java {
     internal fun test() {
         val m: HashMap<*, *> = HashMap<Any?, Any?>()

nj2k/testData/newJ2k/issues/kt-19327.kt

@@ -1,10 +1,7 @@
-// ERROR: Unresolved reference: stream
-// ERROR: Unresolved reference: stream
-// ERROR: Unresolved reference: Collectors
 import java.util.stream.Collectors
 
 internal class JavaCode {
-    fun toJSON(collection: Collection<Int?>): String {
-        return "[" + collection.stream().map({ obj: Object -> obj.toString() }).collect(Collectors.joining(", ")).toString() + "]"
+    fun toJSON(collection: Collection<Int>): String {
+        return "[" + collection.stream().map { obj: Int -> obj.toString() }.collect(Collectors.joining(", ")).toString() + "]"
     }
-}
+}

nj2k/testData/newJ2k/issues/kt-19336.kt

@@ -1,6 +1,6 @@
 class TestReturnsArray {
     fun strings(n: Int): Array<String?> {
-        val result = arrayOfNulls<String>(n)
+        val result = arrayOfNulls<String?>(n)
         for (i in 0 until n) {
             result[i] = Integer.toString(i)
         }

nj2k/testData/newJ2k/issues/kt-19346.kt

@@ -2,7 +2,7 @@ package test
 
 class TestAssignmentInReturn {
     private var last: String? = null
-    fun foo(s: String): String? {
+    fun foo(s: String): String {
         return s.also { last = it }
     }
 }

nj2k/testData/newJ2k/issues/kt-19348.kt

@@ -14,7 +14,7 @@ class TestMutltipleCtorsWithJavadoc
      * @param x
      * @param y
      */
-    constructor(x: String?, y: String?) : this(x!!) {
+    constructor(x: String, y: String?) : this(x) {
         this.y = y
     }
 

nj2k/testData/newJ2k/issues/kt-19382.kt

@@ -3,7 +3,7 @@ package test
 import java.util.HashMap
 
 class TestPrimitiveFromMap {
-    fun foo(map: HashMap<String, Int?>): Int {
+    fun foo(map: HashMap<String, Int>): Int {
         return map["zzz"]!!
     }
 }

nj2k/testData/newJ2k/issues/kt-19383.kt

@@ -1,7 +1,7 @@
 package test
 
 class TestMapGetAsReceiver {
-    fun foo(map: Map<String, String?>): Int {
+    fun foo(map: Map<String, String>): Int {
         return map["zzz"]!!.length
     }
 }

nj2k/testData/newJ2k/issues/kt-19396.kt

@@ -3,7 +3,7 @@ package test
 class TestValReassign(private val s1: String) {
     private var s2: String? = null
 
-    constructor(s1: String?, s2: String?) : this(s1!!) {
+    constructor(s1: String, s2: String?) : this(s1) {
         this.s2 = s2
     }
 

nj2k/testData/newJ2k/issues/kt-19550.kt

@@ -3,15 +3,15 @@ class TestToStringReturnsNullable {
         var string: String? = null
     }
 
-    open class Ctor(string: String?) : Base() {
+    open class Ctor(string: String) : Base() {
         init {
             this.string = string
         }
     }
 
-    class Derived(string: String?) : Ctor(string) {
+    class Derived(string: String) : Ctor(string) {
         override fun toString(): String {
             return string!!
         }
     }
-}
+}