Remove OI/NI attributes from test data

compiler/testData/diagnostics/tests/j+k/genericConstructor/classTypeParameterInferredFromArgument.kt

@@ -8,7 +8,7 @@ public class A<E> {
 // FILE: main.kt
 
 fun test(x: List<Int>, y: List<String>) {
-    A("", x) checkType { <!UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>_<!><A<Any?>>() }
+    A("", x) checkType { <!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>_<!><A<Any?>>() }
     A("", y) checkType { _<A<String?>>() }
 
     A<CharSequence, String>("", <!TYPE_MISMATCH, TYPE_MISMATCH!>x<!>)

compiler/testData/diagnostics/tests/j+k/genericConstructor/innerClass.kt

@@ -12,6 +12,6 @@ fun test(x: List<Int>, y: List<String>) {
     Outer<Int>().Inner("", y, 1) checkType { _<Outer<Int>.Inner<String>>() }
     Outer<Int>().Inner<CharSequence, String, Int>("", y, 1) checkType { _<Outer<Int>.Inner<CharSequence>>() }
 
-    Outer<Int>().Inner("", x, 1) checkType { <!UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>_<!><Outer<Int>.Inner<Any>>() }
+    Outer<Int>().Inner("", x, 1) checkType { <!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>_<!><Outer<Int>.Inner<Any>>() }
     Outer<Int>().Inner<CharSequence, String, Int>("", <!TYPE_MISMATCH, TYPE_MISMATCH!>x<!>, 1)
 }

compiler/testData/diagnostics/tests/j+k/genericConstructor/noClassTypeParametersInvParameter.kt

@@ -9,7 +9,7 @@ public class A {
 class Inv<T>
 
 fun test(x: Inv<Int>, y: Inv<String>) {
-    <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}!>A<!>("", <!TYPE_MISMATCH{NI}!>x<!>)
+    A("", <!TYPE_MISMATCH!>x<!>)
     A("", y)
 
     A<String>("", <!TYPE_MISMATCH, TYPE_MISMATCH, TYPE_MISMATCH!>x<!>)

compiler/testData/diagnostics/tests/j+k/genericConstructor/recursive.kt

@@ -8,4 +8,4 @@ public class C {
 
 // FILE: main.kt
 
-fun foo() = <!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>C<!>(<!NO_VALUE_FOR_PARAMETER!>)<!>
+fun foo() = C(<!NO_VALUE_FOR_PARAMETER!>)<!>

compiler/testData/diagnostics/tests/j+k/genericConstructor/superCall.kt

@@ -9,9 +9,9 @@ public class A<E> {
 // FILE: main.kt
 
 class B1(x: List<String>) : A<CharSequence>("", x)
-class B2(x: List<Int>) : <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}!>A<CharSequence>("", x)<!>
+class B2(x: List<Int>) : A<CharSequence>("", x)
 
 class C : A<CharSequence> {
     constructor(x: List<String>) : super("", x)
-    constructor(x: List<Int>, y: Int) : <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}!>super<!>("", x)
+    constructor(x: List<Int>, y: Int) : super("", x)
 }

compiler/testData/diagnostics/tests/j+k/genericConstructor/superCallImpossibleToInfer.kt

@@ -11,10 +11,10 @@ public class A<E> {
 // TODO: It's effectively impossible to perform super call to such constructor
 // if there is not enough information to infer corresponding arguments
 // May be we could add some special syntax for such arguments
-class B1(x: List<String>) : <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}!><!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>A<!><CharSequence><!>("", x)
-class B2(x: List<Int>) : <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}!>A<CharSequence>("", x)<!>
+class B1(x: List<String>) : <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>A<CharSequence><!>("", x)
+class B2(x: List<Int>) : A<CharSequence>("", x)
 
 class C : A<CharSequence> {
-    constructor(x: List<String>) : <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>super<!>("", x)
-    constructor(x: List<Int>, y: Int) : <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}!>super<!>("", x)
+    constructor(x: List<String>) : <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>super<!>("", x)
+    constructor(x: List<Int>, y: Int) : super("", x)
 }

compiler/testData/diagnostics/tests/j+k/genericConstructorWithMultipleBounds.kt

@@ -10,8 +10,8 @@ public class J {
 
 import java.io.Serializable
 
-fun cloneable(c: Cloneable) = <!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>J<!>(<!TYPE_MISMATCH{NI}!>c<!>)
+fun cloneable(c: Cloneable) = J(<!TYPE_MISMATCH!>c<!>)
 
-fun serializable(s: Serializable) = <!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>J<!>(<!TYPE_MISMATCH{NI}!>s<!>)
+fun serializable(s: Serializable) = J(<!TYPE_MISMATCH!>s<!>)
 
 fun <T> both(t: T) where T : Cloneable, T : Serializable = J(t)

compiler/testData/diagnostics/tests/j+k/sam/enhancedSamConstructor.kt

@@ -15,12 +15,12 @@ public interface J2 extends J {
 
 // FILE: main.kt
 fun main() {
-    J <!TYPE_MISMATCH{NI}!>{ <!EXPECTED_PARAMETER_TYPE_MISMATCH!>s: String<!> -> s}<!> // should be prohibited, because SAM value parameter has nullable type
+    J <!TYPE_MISMATCH!>{ <!EXPECTED_PARAMETER_TYPE_MISMATCH!>s: String<!> -> s}<!> // should be prohibited, because SAM value parameter has nullable type
     J { "" + it<!UNSAFE_CALL!>.<!>length }
     J { <!NULL_FOR_NONNULL_TYPE, NULL_FOR_NONNULL_TYPE!>null<!> }
     J { <!TYPE_MISMATCH, TYPE_MISMATCH, TYPE_MISMATCH!>it?.length?.toString()<!> }
 
-    J2 <!TYPE_MISMATCH{NI}!>{ <!EXPECTED_PARAMETER_TYPE_MISMATCH!>s: String<!> -> s}<!>
+    J2 <!TYPE_MISMATCH!>{ <!EXPECTED_PARAMETER_TYPE_MISMATCH!>s: String<!> -> s}<!>
     J2 { "" + it<!UNSAFE_CALL!>.<!>length }
     J2 { <!NULL_FOR_NONNULL_TYPE, NULL_FOR_NONNULL_TYPE!>null<!> }
     J2 { <!TYPE_MISMATCH, TYPE_MISMATCH, TYPE_MISMATCH!>it?.length?.toString()<!> }

compiler/testData/diagnostics/tests/j+k/wrongVarianceInJava.kt

@@ -19,5 +19,5 @@ class In<in F> {
 
 fun test() {
     A.foo().x() checkType { _<Any?>() }
-    A.bar().<!MEMBER_PROJECTED_OUT{OI}!>y<!>(<!NULL_FOR_NONNULL_TYPE{NI}!>null<!>)
+    A.bar().y(<!NULL_FOR_NONNULL_TYPE!>null<!>)
 }