[FIR] Ignore failing test, improve DiagnosticKind, fix UPPER_BOUND

compiler/testData/diagnostics/tests/scopes/inheritance/nestedClassesFromInterface.fir.kt

@@ -1,27 +0,0 @@
-// FILE: A.java
-public interface A {
-    public class A_ {}
-}
-
-// FILE: 1.kt
-interface B {
-    class B_
-}
-
-class X: A {
-    val a: <!OTHER_ERROR!>A_<!> = <!UNRESOLVED_REFERENCE!>A_<!>()
-    val b: A.A_ = A.A_()
-
-    companion object {
-        val a: <!OTHER_ERROR!>A_<!> = <!UNRESOLVED_REFERENCE!>A_<!>()
-    }
-}
-
-class Y: B {
-    val a: <!OTHER_ERROR!>B_<!> = <!UNRESOLVED_REFERENCE!>B_<!>()
-    val b: B.B_ = B.B_()
-
-    companion object {
-        val b: <!OTHER_ERROR!>B_<!> = <!UNRESOLVED_REFERENCE!>B_<!>()
-    }
-}

compiler/testData/diagnostics/tests/scopes/inheritance/nestedClassesFromInterface.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FILE: A.java
 public interface A {
     public class A_ {}

compiler/testData/diagnostics/tests/scopes/inheritance/nestedCompanionClass.fir.kt

@@ -7,14 +7,14 @@ open class A {
 }
 
 class C: A() {
-    val b: <!OTHER_ERROR!>B<!> = null!!
+    val b: <!UNRESOLVED_REFERENCE!>B<!> = null!!
 
     init {
         <!UNRESOLVED_REFERENCE!>B<!>()
     }
 
     object O {
-        val b: <!OTHER_ERROR!>B<!> = null!!
+        val b: <!UNRESOLVED_REFERENCE!>B<!> = null!!
 
         init {
             <!UNRESOLVED_REFERENCE!>B<!>()
@@ -22,7 +22,7 @@ class C: A() {
     }
 
     class K {
-        val b: <!OTHER_ERROR!>B<!> = null!!
+        val b: <!UNRESOLVED_REFERENCE!>B<!> = null!!
 
         init {
             <!UNRESOLVED_REFERENCE!>B<!>()
@@ -30,7 +30,7 @@ class C: A() {
     }
 
     inner class I {
-        val b: <!OTHER_ERROR!>B<!> = null!!
+        val b: <!UNRESOLVED_REFERENCE!>B<!> = null!!
 
         init {
             <!UNRESOLVED_REFERENCE!>B<!>()

compiler/testData/diagnostics/tests/scopes/inheritance/nestedFromJava.fir.kt

@@ -23,7 +23,7 @@ public class C extends B implements A {
 // FILE: 1.kt
 
 class X: A {
-    val a_s: <!OTHER_ERROR!>A_S<!> = null!!
+    val a_s: <!UNRESOLVED_REFERENCE!>A_S<!> = null!!
 
     init {
         <!UNRESOLVED_REFERENCE!>A_S<!>()
@@ -32,7 +32,7 @@ class X: A {
     }
 
     object xD {
-        val a_: <!OTHER_ERROR!>A_S<!> = null!!
+        val a_: <!UNRESOLVED_REFERENCE!>A_S<!> = null!!
 
         init {
             <!UNRESOLVED_REFERENCE!>A_S<!>()
@@ -66,7 +66,7 @@ class Y: B() {
 }
 
 class Z: C() {
-    val a_s: <!OTHER_ERROR!>A_S<!> = null!!
+    val a_s: <!UNRESOLVED_REFERENCE!>A_S<!> = null!!
     val b_: B_ = null!!
     val b_s: B_S = null!!
 
@@ -77,7 +77,7 @@ class Z: C() {
     }
 
     object X {
-        val a_s: <!OTHER_ERROR!>A_S<!> = null!!
+        val a_s: <!UNRESOLVED_REFERENCE!>A_S<!> = null!!
         val b_: B_ = null!!
         val b_s: B_S = null!!
 

compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/inheritFromContainingClass_after.fir.kt

@@ -30,7 +30,7 @@ open class A<T> : J() {
             foo()
             bar()
             val a: Int = baz()
-            val b: <!OTHER_ERROR!>T<!> = baz()
+            val b: <!UNRESOLVED_REFERENCE!>T<!> = baz()
         }
     }
 
@@ -39,14 +39,14 @@ open class A<T> : J() {
             foo()
             bar()
             val a: Int = baz()
-            val b: <!OTHER_ERROR!>T<!> = baz()
+            val b: <!UNRESOLVED_REFERENCE!>T<!> = baz()
         }
 
         fun test() {
             foo()
             bar()
             val a: Int = baz()
-            val b: <!OTHER_ERROR!>T<!> = baz()
+            val b: <!UNRESOLVED_REFERENCE!>T<!> = baz()
         }
 
         fun bar() {}

compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/inheritFromContainingClass_before.fir.kt

@@ -30,7 +30,7 @@ open class A<T> : J() {
             foo()
             bar()
             val a: Int = baz()
-            val b: <!OTHER_ERROR!>T<!> = baz()
+            val b: <!UNRESOLVED_REFERENCE!>T<!> = baz()
         }
     }
 
@@ -39,14 +39,14 @@ open class A<T> : J() {
             foo()
             bar()
             val a: Int = baz()
-            val b: <!OTHER_ERROR!>T<!> = baz()
+            val b: <!UNRESOLVED_REFERENCE!>T<!> = baz()
         }
 
         fun test() {
             foo()
             bar()
             val a: Int = baz()
-            val b: <!OTHER_ERROR!>T<!> = baz()
+            val b: <!UNRESOLVED_REFERENCE!>T<!> = baz()
         }
 
         fun bar() {}