Add diagnostics to test data from NI

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

@@ -5,7 +5,7 @@ fun foo() {
     v = "abc"
     <!DEBUG_INFO_SMARTCAST!>v<!>.length
     v = null
-    <!DEBUG_INFO_CONSTANT!>v<!><!UNSAFE_CALL!>.<!>length
+    <!OI;DEBUG_INFO_CONSTANT!>v<!><!UNSAFE_CALL!>.<!>length
     v = "abc"
     <!DEBUG_INFO_SMARTCAST!>v<!>.length
 }

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

@@ -6,7 +6,7 @@ fun foo() {
     val y = x
     x = null
     if (y != null) {
-        <!DEBUG_INFO_CONSTANT!>x<!><!UNSAFE_CALL!>.<!>hashCode()
+        <!OI;DEBUG_INFO_CONSTANT!>x<!><!UNSAFE_CALL!>.<!>hashCode()
     }
 }
 
@@ -23,7 +23,7 @@ fun bar(s: String?) {
     val hashCode = ss?.hashCode()
     ss = null
     if (hashCode != null) {
-        <!DEBUG_INFO_CONSTANT!>ss<!><!UNSAFE_CALL!>.<!>hashCode()
+        <!OI;DEBUG_INFO_CONSTANT!>ss<!><!UNSAFE_CALL!>.<!>hashCode()
     }
 }
 

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

@@ -13,5 +13,5 @@ fun list(start: SomeObject): SomeObject {
         e = e<!UNSAFE_CALL!>.<!>next()
     }
     // Smart cast is not possible here due to next()
-    return <!TYPE_MISMATCH!>e<!>
+    return <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>e<!>
 }

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

@@ -14,5 +14,5 @@ fun list(start: SomeObject): SomeObject {
         <!DEBUG_INFO_SMARTCAST!>e<!>.doSomething()
         e = <!DEBUG_INFO_SMARTCAST!>e<!>.next()
     }
-    return <!TYPE_MISMATCH!>e<!>
+    return <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>e<!>
 }

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

@@ -14,5 +14,5 @@ fun list(start: SomeObject): SomeObject {
         <!DEBUG_INFO_SMARTCAST!>e<!>.doSomething()
         e = <!DEBUG_INFO_SMARTCAST!>e<!>.next()
     }
-    return <!TYPE_MISMATCH!>e<!>
+    return <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>e<!>
 }

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

@@ -76,5 +76,5 @@ fun test6() {
     finally {
         a = null
     }
-    <!DEBUG_INFO_CONSTANT!>a<!><!UNSAFE_CALL!>.<!>hashCode() // a is null here
+    <!OI;DEBUG_INFO_CONSTANT!>a<!><!UNSAFE_CALL!>.<!>hashCode() // a is null here
 }

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

@@ -4,5 +4,5 @@ fun foo() {
     // It is possible in principle to provide smart cast here
     v<!UNSAFE_CALL!>.<!>length
     v = null
-    <!DEBUG_INFO_CONSTANT!>v<!><!UNSAFE_CALL!>.<!>length
+    <!OI;DEBUG_INFO_CONSTANT!>v<!><!UNSAFE_CALL!>.<!>length
 }

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

@@ -12,10 +12,10 @@ operator fun Long?.inc() = this?.let { it + 1 }
 fun bar(arg: Long?): Long {
     var i = arg
     if (i++ == 5L) {
-        return i<!UNSAFE_CALL!>--<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>+<!> i
+        return <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH!>i<!UNSAFE_CALL!>--<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>+<!> i<!>
     }
     if (i++ == 7L) {
-        return i++ <!UNSAFE_OPERATOR_CALL!>+<!> <!TYPE_MISMATCH!>i<!>
+        return i++ <!NI;DEBUG_INFO_UNRESOLVED_WITH_TARGET, NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER, OI;UNSAFE_OPERATOR_CALL!>+<!> <!OI;TYPE_MISMATCH!>i<!>
     }
     return 0L
 }

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

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

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

@@ -14,7 +14,7 @@ class MyClass {
         m = create()
         // See KT-7428
         for ((k, v) in <!SMARTCAST_IMPOSSIBLE!>m<!>)
-            res += (k.length + v.length)
+            res <!NI;NONE_APPLICABLE!>+=<!> (k.<!NI;UNRESOLVED_REFERENCE!>length<!> <!NI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>+<!> v.<!NI;UNRESOLVED_REFERENCE!>length<!>)
         return res
     }
 }

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

@@ -9,7 +9,7 @@ fun IntArray.forEachIndexed( op: (i: Int, value: Int) -> Unit) {
 fun max(a: IntArray): Int? {
     var maxI: Int? = null
     a.forEachIndexed { i, value ->
-        if (maxI == null || value >= a[<!SMARTCAST_IMPOSSIBLE!>maxI<!>])
+        if (maxI == null || value >= a[<!NI;SMARTCAST_IMPOSSIBLE, SMARTCAST_IMPOSSIBLE!>maxI<!>])
             maxI = i
     }
     return maxI

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

@@ -2,5 +2,5 @@
 fun foo(): Int {
     var i: Int? = <!VARIABLE_WITH_REDUNDANT_INITIALIZER!>42<!>
     i = null
-    return <!TYPE_MISMATCH!><!DEBUG_INFO_CONSTANT!>i<!> + 1<!>
+    return <!NI;TYPE_MISMATCH, TYPE_MISMATCH!><!OI;DEBUG_INFO_CONSTANT!>i<!> + 1<!>
 }

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

@@ -2,5 +2,5 @@
 fun foo(): Int {
     var s: String? = <!VARIABLE_WITH_REDUNDANT_INITIALIZER!>"abc"<!>
     s = null
-    return <!DEBUG_INFO_CONSTANT!>s<!><!UNSAFE_CALL!>.<!>length
+    return <!OI;DEBUG_INFO_CONSTANT!>s<!><!UNSAFE_CALL!>.<!>length
 }