Remove OI/NI attributes from test data

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

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

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

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

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

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

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

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

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

@@ -11,7 +11,7 @@ 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{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>+<!> i
+        return i<!UNSAFE_CALL!>--<!> <!DEBUG_INFO_MISSING_UNRESOLVED!>+<!> i
     }
     if (i++ == 7L) {
         return i++ <!UNSAFE_OPERATOR_CALL!>+<!> <!TYPE_MISMATCH!>i<!>

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

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

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

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

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

@@ -1,4 +1,3 @@
-
 fun create(): Map<String, String> = null!!
 
 operator fun <K, V> Map<K, V>.iterator(): Iterator<Map.Entry<K, V>> = null!!
@@ -14,7 +13,7 @@ class MyClass {
         m = create()
         // See KT-7428
         for ((k, v) in <!SMARTCAST_IMPOSSIBLE!>m<!>)
-            res += (<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{NI}!>k<!>.<!DEBUG_INFO_MISSING_UNRESOLVED{NI}!>length<!> <!DEBUG_INFO_MISSING_UNRESOLVED{NI}!>+<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{NI}!>v<!>.<!DEBUG_INFO_MISSING_UNRESOLVED{NI}!>length<!>)
+            res += (<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>k<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>length<!> <!DEBUG_INFO_MISSING_UNRESOLVED!>+<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>v<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>length<!>)
         return res
     }
 }

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

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

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

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