[FIR] Resolve ambiguities in Java static scopes

compiler/testData/diagnostics/tests/deprecated/javaDeprecatedInheritance.fir.kt

@@ -44,7 +44,7 @@ fun use(a: A, b: B, c: C) {
     c.f()
 
     A.D
-    B.<!AMBIGUITY!>D<!>
+    B.D
     C.D
 
     A.bar()

compiler/testData/diagnostics/tests/j+k/StaticMembersFromSuperclasses.fir.kt

@@ -13,4 +13,4 @@ public class Bbb extends Aaa {
 
 // FILE: b.kt
 
-fun foo() = Bbb.<!AMBIGUITY!>i<!>
+fun foo() = Bbb.i

compiler/testData/diagnostics/tests/j+k/shadowingPrimitiveStaticField.fir.kt

@@ -4,9 +4,9 @@ import aa.B
 
 fun use() {
     // checking that CONST is of platform type
-    B.<!AMBIGUITY!>CONST<!> = null
-    B.<!AMBIGUITY!>CONST<!>?.<!UNRESOLVED_REFERENCE!>length<!>
-    B.<!AMBIGUITY!>CONST<!>.<!UNRESOLVED_REFERENCE!>length<!>
+    B.CONST = null
+    B.CONST?.length
+    B.CONST.length
 }
 
 // FILE: aa/A.java

compiler/testData/diagnostics/tests/scopes/inheritance/statics/hidePrivateByPublic.fir.kt

@@ -30,7 +30,7 @@ fun test() {
     B.a
     B.foo()
     B.foo(1)
-    B.<!AMBIGUITY!>b<!>
+    B.b
     B.bar()
     B.bar(1)
 }

compiler/testData/diagnostics/tests/scopes/inheritance/statics/nameClash0.fir.kt

@@ -28,5 +28,5 @@ fun test() {
     B.field
 
     E.<!AMBIGUITY!>field<!>
-    O.<!AMBIGUITY!>field<!>
+    O.field
 }

compiler/testData/diagnostics/tests/scopes/inheritance/statics/nameClash1.fir.kt

@@ -25,8 +25,8 @@ public class O implements A, B {
 
 fun test() {
     A.field
-    B.<!AMBIGUITY!>field<!>
+    B.field
 
     E.<!AMBIGUITY!>field<!>
-    O.<!AMBIGUITY!>field<!>
+    O.field
 }

compiler/testData/diagnostics/tests/scopes/inheritance/statics/nameClash2.fir.kt

@@ -57,10 +57,10 @@ fun test() {
     D.field
 
     E.<!AMBIGUITY!>field<!>
-    O.<!AMBIGUITY!>field<!>
+    O.field
 
     EE.<!AMBIGUITY!>field<!>
-    EO.<!AMBIGUITY!>field<!>
+    EO.field
 
-    OO.<!AMBIGUITY!>field<!>
+    OO.field
 }

compiler/testData/diagnostics/tests/scopes/inheritance/statics/oneInterfaceManyTimes.fir.kt

@@ -47,7 +47,7 @@ fun test() {
     D.bar()
     D.baz()
 
-    E.<!AMBIGUITY!>a<!>
+    E.a
     E.b
     E.c
     E.bar()