Remove OI/NI attributes from test data

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

@@ -240,7 +240,7 @@ class Outer() {
 }
 
 class ForwardAccessToBackingField() { //kt-147
-    val a = <!DEBUG_INFO_MISSING_UNRESOLVED{NI}, TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM, UNINITIALIZED_VARIABLE{OI}!>a<!> // error
+    val a = <!DEBUG_INFO_MISSING_UNRESOLVED, TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>a<!> // error
     val b = <!UNINITIALIZED_VARIABLE!>c<!> // error
     val c = 1
 }

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

@@ -11,16 +11,16 @@ else {
 }
 
 val ww = if (true) {
-    <!TYPE_MISMATCH{OI}!>{ true }<!> <!USELESS_ELVIS!>?: null!!<!>
+    { true } <!USELESS_ELVIS!>?: null!!<!>
 }
 else if (true) {
-    <!TYPE_MISMATCH{OI}!>{ true }<!> <!USELESS_ELVIS!>?: null!!<!>
+    { true } <!USELESS_ELVIS!>?: null!!<!>
 }
 else {
     null!!
 }
 
-val <!IMPLICIT_NOTHING_PROPERTY_TYPE{OI}!>n<!> = null ?: (null ?: <!TYPE_MISMATCH{OI}!>{ true }<!>)
+val n = null ?: (null ?: { true })
 
 fun l(): (() -> Boolean)? = null
 
@@ -33,6 +33,6 @@ val bbb = null ?: ( l() <!USELESS_ELVIS_RIGHT_IS_NULL!>?: null<!>)
 val bbbb = ( l() <!USELESS_ELVIS_RIGHT_IS_NULL!>?: null<!>) ?: ( l() <!USELESS_ELVIS_RIGHT_IS_NULL!>?: null<!>)
 
 fun f(x : Long?): Long {
-    var a = x ?: (<!TYPE_MISMATCH{OI}!>fun() {}<!> <!USELESS_ELVIS!>?: <!TYPE_MISMATCH{OI}!>fun() {}<!><!>)
-    return <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, TYPE_MISMATCH{NI}!>a<!>
+    var a = x ?: (fun() {} <!USELESS_ELVIS!>?: fun() {}<!>)
+    return <!TYPE_MISMATCH!>a<!>
 }

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

@@ -1,11 +1,11 @@
 // AssertionError for nested ifs with lambdas and Nothing as results
 // NI_EXPECTED_FILE
 
-val <!IMPLICIT_NOTHING_PROPERTY_TYPE{OI}!>fn<!> = if (true) {
-    <!TYPE_MISMATCH{OI}!>{ true }<!>
-} 
+val fn = if (true) {
+    { true }
+}
 else if (true) {
-    <!TYPE_MISMATCH{OI}!>{ true }<!>
+    { true }
 }
 else {
     null!!