From 6eab6f2f879cff466336d9c014d25ac8fa8687f9 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <mikhail.glukhikh@jetbrains.com>
Date: Fri, 31 Jul 2020 20:07:11 +0300
Subject: [PATCH] [FIR TEST] Replace OTHER_ERROR with UNRESOLVED_REFERENCE in
 test data

---
 .../problems/KJKComplexHierarchyNestedLoop.kt                 | 2 +-
 compiler/testData/diagnostics/tests/EnumEntryAsType.fir.kt    | 2 +-
 .../testsWithStdLib/InaccessibleInternalClass.fir.kt          | 2 +-
 .../callableReference/callableReferenceOnUnresolvedLHS.fir.kt | 2 +-
 .../coroutines/noDefaultCoroutineImports.fir.kt               | 2 +-
 .../coroutines/suspendFunctionType/suspendFunctionN.fir.kt    | 4 ++--
 .../diagnostics/testsWithStdLib/regression/kt37727.fir.kt     | 4 ++--
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/KJKComplexHierarchyNestedLoop.kt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/KJKComplexHierarchyNestedLoop.kt
index 4abc5169434..151031d03c9 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/KJKComplexHierarchyNestedLoop.kt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/KJKComplexHierarchyNestedLoop.kt
@@ -1,6 +1,6 @@
 // FILE: K1.kt
 class K2: J1() {
-    class Q : <!OTHER_ERROR!>Nested<!>()
+    class Q : <!UNRESOLVED_REFERENCE!>Nested<!>()
     fun bar() {
         <!UNRESOLVED_REFERENCE!>foo<!>()
         <!UNRESOLVED_REFERENCE!>baz<!>()
diff --git a/compiler/testData/diagnostics/tests/EnumEntryAsType.fir.kt b/compiler/testData/diagnostics/tests/EnumEntryAsType.fir.kt
index 16a6cf63c35..6cec2bd2f5f 100644
--- a/compiler/testData/diagnostics/tests/EnumEntryAsType.fir.kt
+++ b/compiler/testData/diagnostics/tests/EnumEntryAsType.fir.kt
@@ -49,7 +49,7 @@ fun <T> bar(a: Any): T = a as T
 fun <T> foo() {
     foo<<!UNRESOLVED_REFERENCE!>Color.RED<!>>()
     foo<RedAlias>()
-    <!INAPPLICABLE_CANDIDATE!>bar<!><Color.RED>(Color.RED)
+    <!INAPPLICABLE_CANDIDATE!>bar<!><<!UNRESOLVED_REFERENCE!>Color.RED<!>>(Color.RED)
 }
 
 fun <!UNRESOLVED_REFERENCE!>Array<Color.RED><!>.foo(entries: <!UNRESOLVED_REFERENCE!>Array<Color.RED><!>): <!UNRESOLVED_REFERENCE!>Array<Color.RED><!> = null!!
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithStdLib/InaccessibleInternalClass.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/InaccessibleInternalClass.fir.kt
index 008d94b0fbb..99a7d664c06 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/InaccessibleInternalClass.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/InaccessibleInternalClass.fir.kt
@@ -10,6 +10,6 @@ package kotlin.sequences
 import p.*
 
 interface I {
-    val <!EXPOSED_PROPERTY_TYPE!>v1<!>: <!OTHER_ERROR!>FilteringSequence<!>
+    val v1: FilteringSequence
     val <!EXPOSED_PROPERTY_TYPE!>v2<!>: IndexingSequence<String>
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/callableReference/callableReferenceOnUnresolvedLHS.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/callableReference/callableReferenceOnUnresolvedLHS.fir.kt
index 21021d98119..1128663eb10 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/callableReference/callableReferenceOnUnresolvedLHS.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/callableReference/callableReferenceOnUnresolvedLHS.fir.kt
@@ -3,7 +3,7 @@
 interface Inv
 class Impl : Inv
 
-class Scope<InterfaceT, ImplementationT : InterfaceT>(private val implClass: <!OTHER_ERROR, OTHER_ERROR, OTHER_ERROR!>j.Class<ImplementationT><!>) {
+class Scope<InterfaceT, ImplementationT : InterfaceT>(private val implClass: <!UNRESOLVED_REFERENCE, UNRESOLVED_REFERENCE, UNRESOLVED_REFERENCE!>j.Class<ImplementationT><!>) {
     fun foo(c: Collection<InterfaceT>) {
         val hm = c.asSequence()
             .<!INAPPLICABLE_CANDIDATE!>filter<!>(<!UNRESOLVED_REFERENCE!>implClass::isInstance<!>)
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/noDefaultCoroutineImports.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/noDefaultCoroutineImports.fir.kt
index 11ef48e60a9..1e7e7f9c3a0 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/noDefaultCoroutineImports.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/noDefaultCoroutineImports.fir.kt
@@ -1,7 +1,7 @@
 // FILE: 1.kt
 // COMMON_COROUTINES_TEST
 
-fun test(c: <!OTHER_ERROR!>Continuation<Unit><!>) {}
+fun test(c: <!UNRESOLVED_REFERENCE!>Continuation<Unit><!>) {}
 
 // FILE: 2.kt
 import COROUTINES_PACKAGE.*
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/suspendFunctionN.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/suspendFunctionN.fir.kt
index 22d898ca1a1..7a39863d161 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/suspendFunctionN.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/suspendFunctionN.fir.kt
@@ -1,4 +1,4 @@
 // JAVAC_SKIP
-typealias Test1 = <!OTHER_ERROR!>SuspendFunction0<Unit><!>
-typealias Test2 = <!OTHER_ERROR!>kotlin.SuspendFunction0<Unit><!>
+typealias Test1 = <!UNRESOLVED_REFERENCE!>SuspendFunction0<Unit><!>
+typealias Test2 = <!UNRESOLVED_REFERENCE!>kotlin.SuspendFunction0<Unit><!>
 typealias Test3 = kotlin.coroutines.SuspendFunction0<Unit>
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithStdLib/regression/kt37727.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/regression/kt37727.fir.kt
index 59e7df855f0..40dcbb2bb67 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/regression/kt37727.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/regression/kt37727.fir.kt
@@ -1,5 +1,5 @@
-data class A(val x: <!OTHER_ERROR, OTHER_ERROR, OTHER_ERROR!>Set<CLassNotFound><!> = setOf()) {
-    fun with(x: <!OTHER_ERROR, OTHER_ERROR!>Set<CLassNotFound>?<!> = null) {
+data class A(val x: <!UNRESOLVED_REFERENCE, UNRESOLVED_REFERENCE!>Set<CLassNotFound><!> = setOf()) {
+    fun with(x: <!UNRESOLVED_REFERENCE, UNRESOLVED_REFERENCE!>Set<CLassNotFound>?<!> = null) {
         A(x ?: this.x)
     }
 }