[NI] Don't discriminate Nothing-type from resulting ones

^KT-32106 Fixed

compiler/testData/diagnostics/tests/callableReference/bound/reservedExpressionSyntax3.kt

@@ -23,7 +23,7 @@ class Test {
     val Int.c: Int get() = 42
 
     val test1: () -> Right = <!RESERVED_SYNTAX_IN_CALLABLE_REFERENCE_LHS!><!DEBUG_INFO_MISSING_UNRESOLVED!>a<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>b<!><<!DEBUG_INFO_MISSING_UNRESOLVED!>Int<!>>.<!DEBUG_INFO_MISSING_UNRESOLVED!>c<!><!>::<!DEBUG_INFO_MISSING_UNRESOLVED!>foo<!>
-    val test1a: () -> Right = a.<!NI;DEBUG_INFO_LEAKING_THIS!>b<!>.<!NI;DEBUG_INFO_LEAKING_THIS!>c<!>::foo
+    val test1a: () -> Right = a.b.c::foo
 
     val test2: () -> Right = <!RESERVED_SYNTAX_IN_CALLABLE_REFERENCE_LHS!><!DEBUG_INFO_MISSING_UNRESOLVED!>a<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>b<!><<!DEBUG_INFO_MISSING_UNRESOLVED!>Int<!>>.<!DEBUG_INFO_MISSING_UNRESOLVED!>c<!><!>?::<!DEBUG_INFO_MISSING_UNRESOLVED!>foo<!>
 }

compiler/testData/diagnostics/tests/controlFlowAnalysis/throwInLambda.kt

@@ -8,6 +8,6 @@ fun foo(): String {
 }
 fun bar(): String {
     val x = fn() ?: return ""
-    <!OI;UNREACHABLE_CODE!>val <!OI;UNUSED_VARIABLE!>y<!> =<!> x<!UNNECESSARY_SAFE_CALL!>?.<!>let { throw Exception() } <!OI;UNREACHABLE_CODE, OI;USELESS_ELVIS!>?: "unreachable"<!>
-    <!OI;UNREACHABLE_CODE!>return y<!>
+    <!UNREACHABLE_CODE!>val <!UNUSED_VARIABLE!>y<!> =<!> x<!UNNECESSARY_SAFE_CALL!>?.<!>let { throw Exception() } <!NI;UNREACHABLE_CODE, NI;USELESS_ELVIS, OI;UNREACHABLE_CODE, OI;USELESS_ELVIS!>?: "unreachable"<!>
+    <!UNREACHABLE_CODE!>return y<!>
 }

compiler/testData/diagnostics/tests/inference/implicitInvokeExtensionWithFunctionalArgument.kt

@@ -25,5 +25,5 @@ fun test(s: SelectorFor<State>): Double {
     val e = s { return p1 }
     e checkType { _<AbstractSelector<State, Nothing>>() }
 
-    <!OI;UNREACHABLE_CODE!>return<!> null!!
+    <!UNREACHABLE_CODE!>return<!> null!!
 }

compiler/testData/diagnostics/tests/inference/nothingType/inferArgumentToNothingFromNullConstant.kt

@@ -0,0 +1,12 @@
+// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_EXPRESSION -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE
+
+class Out<out T : Any>(result: T?)
+
+fun main() {
+    val a = Out(null)
+
+    <!DEBUG_INFO_EXPRESSION_TYPE("Out<kotlin.Nothing>")!>a<!>
+
+    var b: Out<Int>? = null
+    b = a
+}

compiler/testData/diagnostics/tests/inference/nothingType/inferArgumentToNothingFromNullConstant.txt

@@ -0,0 +1,10 @@
+package
+
+public fun main(): kotlin.Unit
+
+public final class Out</*0*/ out T : kotlin.Any> {
+    public constructor Out</*0*/ out T : kotlin.Any>(/*0*/ result: T?)
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}

compiler/testData/diagnostics/tests/inference/nothingType/lambdaNothingAndExpectedType.kt

@@ -1,12 +1,12 @@
-// !LANGUAGE: +NewInference
+// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE
 
 fun <K> select2(x: K, y: K): K = TODO()
 fun <K> select3(x: K, y: K, z: K): K = TODO()
 
 fun test2(f: ((String) -> Int)?) {
-    val a0: ((Int) -> Int)? = select2({ it -> it }, null)
-    val b0: ((Nothing) -> Unit)? = select2({ it -> <!UNUSED_EXPRESSION!>it<!> }, null)
+    val a0: ((Int) -> Int)? = select2(<!TYPE_MISMATCH!>{ <!OI;CANNOT_INFER_PARAMETER_TYPE!>it<!> -> <!OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>it<!> }<!>, null)
+    val b0: ((Nothing) -> Unit)? = select2(<!TYPE_MISMATCH!>{ <!OI;CANNOT_INFER_PARAMETER_TYPE!>it<!> -> <!OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>it<!> }<!>, null)
 
     select3({ it.length }, f, null)
 }

compiler/testData/diagnostics/tests/regressions/kt13685.kt

@@ -2,6 +2,6 @@
 // !DIAGNOSTICS: -UNREACHABLE_CODE
 
 fun foo() {
-    val <!OI;UNUSED_VARIABLE!>text<!>: List<Any> = null!!
+    val <!UNUSED_VARIABLE!>text<!>: List<Any> = null!!
     text.<!UNRESOLVED_REFERENCE!>map<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>Any<!><!SYNTAX!>?<!>::<!DEBUG_INFO_MISSING_UNRESOLVED!>toString<!>
 }

compiler/testData/diagnostics/tests/resolve/invoke/extensionValueAsNonExtension.kt

@@ -19,5 +19,5 @@ fun foo(): A.() -> Int {
     val b: Int = foo()(A())
     val c: Int = (foo())(A())
 
-    <!OI;UNREACHABLE_CODE!>return<!> null!!
+    <!UNREACHABLE_CODE!>return<!> null!!
 }

compiler/testData/diagnostics/tests/smartCasts/alwaysNull.kt

@@ -4,7 +4,7 @@ fun foo(): String {
     s = null
     <!DEBUG_INFO_CONSTANT!>s<!>?.length
     <!OI;DEBUG_INFO_CONSTANT!>s<!><!UNSAFE_CALL!>.<!>length
-    if (<!SENSELESS_COMPARISON!><!DEBUG_INFO_CONSTANT!>s<!> == null<!>) return <!ALWAYS_NULL!>s<!>!!
+    if (<!SENSELESS_COMPARISON!><!DEBUG_INFO_CONSTANT!>s<!> == null<!>) <!NI;UNREACHABLE_CODE!>return<!> <!ALWAYS_NULL!>s<!>!!
     var t: String? = "y"
     if (t == null) t = "x"
     var x: Int? = null

compiler/testData/diagnostics/tests/smartCasts/varnotnull/postfixNotnullClassIncrement.kt

@@ -1,7 +1,7 @@
 // !WITH_NEW_INFERENCE
 class MyClass
 
-operator fun MyClass.inc(): MyClass { <!OI;UNREACHABLE_CODE!>return<!> null!! }
+operator fun MyClass.inc(): MyClass { <!UNREACHABLE_CODE!>return<!> null!! }
 
 public fun box() : MyClass? {
     var i : MyClass?

compiler/testData/diagnostics/tests/smartCasts/varnotnull/prefixNotnullClassIncrement.kt

@@ -1,7 +1,7 @@
 // !WITH_NEW_INFERENCE
 class MyClass
 
-operator fun MyClass.inc(): MyClass { <!OI;UNREACHABLE_CODE!>return<!> null!! }
+operator fun MyClass.inc(): MyClass { <!UNREACHABLE_CODE!>return<!> null!! }
 
 public fun box() {
     var i : MyClass?

compiler/testData/diagnostics/tests/when/whenAndLambdaWithExpectedType.kt

@@ -7,19 +7,19 @@ val test1: (String) -> Boolean =
 
 val test2: (String) -> Boolean =
         when {
-            true -> {{ true }}
+            true -> <!NI;TYPE_MISMATCH!>{{ true }}<!>
             else -> null!!
         }
 
 val test3: (String) -> Boolean =
         when {
-            true -> { <!UNUSED_ANONYMOUS_PARAMETER!>s<!> -> true }
+            true -> <!NI;TYPE_MISMATCH!>{ <!UNUSED_ANONYMOUS_PARAMETER!>s<!> -> true }<!>
             else -> null!!
         }
 
 val test4: (String) -> Boolean =
         when {
-            true -> <!NI;TYPE_MISMATCH!>{ <!EXPECTED_PARAMETERS_NUMBER_MISMATCH!><!UNUSED_ANONYMOUS_PARAMETER!>s1<!>, <!CANNOT_INFER_PARAMETER_TYPE, UNUSED_ANONYMOUS_PARAMETER!>s2<!><!> -> true }<!>
+            true -> <!NI;TYPE_MISMATCH!>{ <!OI;EXPECTED_PARAMETERS_NUMBER_MISMATCH!><!UNUSED_ANONYMOUS_PARAMETER!>s1<!>, <!OI;CANNOT_INFER_PARAMETER_TYPE, UNUSED_ANONYMOUS_PARAMETER!>s2<!><!> -> true }<!>
             else -> null!!
         }
 

compiler/testData/diagnostics/tests/when/whenWithNothingAndLambdas.kt

@@ -6,7 +6,7 @@ val <!OI;IMPLICIT_NOTHING_PROPERTY_TYPE!>test1<!> = when {
 }
 
 val test1a: () -> Boolean = when {
-    true -> { { true } }
+    true -> <!NI;TYPE_MISMATCH!>{ { true } }<!>
     else -> TODO()
 }
 
@@ -33,7 +33,7 @@ val <!OI;IMPLICIT_NOTHING_PROPERTY_TYPE!>test3<!> = when {
 }
 
 val test3a: () -> Boolean = when {
-    true -> { { true } }
-    true -> { { true } }
+    true -> <!NI;TYPE_MISMATCH!>{ { true } }<!>
+    true -> <!NI;TYPE_MISMATCH!>{ { true } }<!>
     else -> TODO()
 }