FIR: rename AMBIGUITY to OVERLOAD_RESOLUTION_AMBIGUITY to match FE 1.0

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

@@ -1,17 +0,0 @@
-// FILE: A.java
-import java.io.Closeable;
-
-public class A {
-    public static void foo(Runnable r) {
-    }
-
-    public static void foo(Closeable c) {
-    }
-}
-
-// FILE: test.kt
-
-fun main() {
-    A.<!AMBIGUITY!>foo<!> { "Hello!" }
-    A.foo(Runnable { "Hello!" })
-}

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

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FILE: A.java
 import java.io.Closeable;
 

compiler/testData/diagnostics/tests/j+k/brokenCode/fieldDuplicates.fir.kt

@@ -9,5 +9,5 @@ public class A {
 
 fun foo() {
     // no exception is thrown (see KT-3898)
-    A().<!AMBIGUITY!>foo<!>
+    A().<!OVERLOAD_RESOLUTION_AMBIGUITY!>foo<!>
 }

compiler/testData/diagnostics/tests/j+k/collectionOverrides/collectionStringImpl.fir.kt

@@ -80,6 +80,6 @@ public class CollectionStringImpl implements Collection<String> {
 // FILE: main.kt
 
 fun test(x: CollectionStringImpl) {
-    x.<!AMBIGUITY!>contains<!>("")
+    x.<!OVERLOAD_RESOLUTION_AMBIGUITY!>contains<!>("")
     (x as Collection<String>).contains("")
 }

compiler/testData/diagnostics/tests/j+k/collectionOverrides/containsAndOverload.fir.kt

@@ -12,9 +12,9 @@ abstract class KA : A() {
 }
 
 fun foo(a: A, ka: KA) {
-    a.<!AMBIGUITY!>contains<!>("")
+    a.<!OVERLOAD_RESOLUTION_AMBIGUITY!>contains<!>("")
     a.<!NONE_APPLICABLE!>contains<!>(1)
-    "" <!AMBIGUITY!>in<!> a
+    "" <!OVERLOAD_RESOLUTION_AMBIGUITY!>in<!> a
     1 <!NONE_APPLICABLE!>in<!> a
 
     ka.contains("")

compiler/testData/diagnostics/tests/j+k/collectionOverrides/overridesBuiltinNoMagic.fir.kt

@@ -150,14 +150,14 @@ class Y2 : X() {
 
 fun main() {
     X().remove("")
-    X().<!AMBIGUITY!>removeAt<!>(1)
+    X().<!OVERLOAD_RESOLUTION_AMBIGUITY!>removeAt<!>(1)
 
     val y: MutableList<String> = Y()
     y.removeAt(1)
 
     Y().remove("")
-    Y().<!AMBIGUITY!>removeAt<!>(1)
+    Y().<!OVERLOAD_RESOLUTION_AMBIGUITY!>removeAt<!>(1)
 
     X().remove("")
-    X().<!AMBIGUITY!>removeAt<!>(1)
+    X().<!OVERLOAD_RESOLUTION_AMBIGUITY!>removeAt<!>(1)
 }

compiler/testData/diagnostics/tests/j+k/collectionOverrides/removeAtInt.fir.kt

@@ -24,7 +24,7 @@ abstract class D : AbstractList<Int>() {
 
 fun main(a: A, b: B, c: ArrayList<Int>) {
     a.remove(1)
-    a.<!AMBIGUITY!>removeAt<!>(0)
+    a.<!OVERLOAD_RESOLUTION_AMBIGUITY!>removeAt<!>(0)
     b.remove(1)
     b.removeAt(0)
     c.remove(1)

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

@@ -17,5 +17,5 @@ class C : B() {
 }
 
 fun foo() {
-    C().<!AMBIGUITY!>size<!>
+    C().<!OVERLOAD_RESOLUTION_AMBIGUITY!>size<!>
 }

compiler/testData/diagnostics/tests/j+k/primitiveOverrides/specializedMap.fir.kt

@@ -102,10 +102,10 @@ fun foo(x: SpecializedMap) {
     x.containsKey(1)
     x.<!INAPPLICABLE_CANDIDATE!>containsKey<!>(null)
 
-    x.<!AMBIGUITY!>get<!>(2)
+    x.<!OVERLOAD_RESOLUTION_AMBIGUITY!>get<!>(2)
     x.<!NONE_APPLICABLE!>get<!>(null)
 
-    x.<!AMBIGUITY!>remove<!>(3)
+    x.<!OVERLOAD_RESOLUTION_AMBIGUITY!>remove<!>(3)
     x.<!NONE_APPLICABLE!>remove<!>(null)
 
     x.put(4, 5.0)

compiler/testData/diagnostics/tests/j+k/properties/fieldPropertyOverloads.fir.kt

@@ -19,8 +19,8 @@ public abstract class CollectionWithSize implements java.util.Collection<String>
 // FILE: main.kt
 
 fun main(c: CollectionWithSize) {
-    CompressionType.ZIP.<!AMBIGUITY!>name<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><Double>() }
-    c.<!AMBIGUITY!>size<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><String>() }
+    CompressionType.ZIP.<!OVERLOAD_RESOLUTION_AMBIGUITY!>name<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><Double>() }
+    c.<!OVERLOAD_RESOLUTION_AMBIGUITY!>size<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><String>() }
 
     CompressionType.ZIP::<!UNRESOLVED_REFERENCE!>name<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><kotlin.reflect.KProperty0<Double>>() }
     c::<!UNRESOLVED_REFERENCE!>size<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><kotlin.reflect.KProperty0<String>>() }

compiler/testData/diagnostics/tests/j+k/properties/fieldPropertyOverloadsDisabled.fir.kt

@@ -20,8 +20,8 @@ public abstract class CollectionWithSize implements java.util.Collection<String>
 // FILE: main.kt
 
 fun main(c: CollectionWithSize) {
-    CompressionType.ZIP.<!AMBIGUITY!>name<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><Double>() }
-    c.<!AMBIGUITY!>size<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><String>() }
+    CompressionType.ZIP.<!OVERLOAD_RESOLUTION_AMBIGUITY!>name<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><Double>() }
+    c.<!OVERLOAD_RESOLUTION_AMBIGUITY!>size<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><String>() }
 
     CompressionType.ZIP::<!UNRESOLVED_REFERENCE!>name<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><kotlin.reflect.KProperty0<Double>>() }
     c::<!UNRESOLVED_REFERENCE!>size<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><kotlin.reflect.KProperty0<String>>() }

compiler/testData/diagnostics/tests/j+k/properties/fieldPropertyOverloadsNI.fir.kt

@@ -19,8 +19,8 @@ public abstract class CollectionWithSize implements java.util.Collection<String>
 // FILE: main.kt
 
 fun main(c: CollectionWithSize) {
-    CompressionType.ZIP.<!AMBIGUITY!>name<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><Double>() }
-    c.<!AMBIGUITY!>size<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><String>() }
+    CompressionType.ZIP.<!OVERLOAD_RESOLUTION_AMBIGUITY!>name<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><Double>() }
+    c.<!OVERLOAD_RESOLUTION_AMBIGUITY!>size<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><String>() }
 
     CompressionType.ZIP::<!UNRESOLVED_REFERENCE!>name<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><kotlin.reflect.KProperty0<Double>>() }
     c::<!UNRESOLVED_REFERENCE!>size<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><kotlin.reflect.KProperty0<String>>() }

compiler/testData/diagnostics/tests/j+k/properties/staticFieldPropertyOverloads.fir.kt

@@ -1,16 +0,0 @@
-// SKIP_TXT
-// !LANGUAGE: +PreferJavaFieldOverload
-// FILE: a/JClass.java
-package a;
-public class JClass {
-    public static int foo = 42;
-}
-// FILE: a.kt
-package b
-val foo = 42
-
-// FILE: b.kt
-
-import a.JClass.foo
-import b.foo
-fun test() { <!AMBIGUITY!>foo<!> }

compiler/testData/diagnostics/tests/j+k/properties/staticFieldPropertyOverloads.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // SKIP_TXT
 // !LANGUAGE: +PreferJavaFieldOverload
 // FILE: a/JClass.java

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

@@ -11,6 +11,6 @@ public class A {
 // FILE: main.kt
 
 fun foo(a: A) {
-    a.<!AMBIGUITY!>foo<!>() <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><String>() }
-    A.<!AMBIGUITY!>bar<!>() <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><String>() }
+    a.<!OVERLOAD_RESOLUTION_AMBIGUITY!>foo<!>() <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><String>() }
+    A.<!OVERLOAD_RESOLUTION_AMBIGUITY!>bar<!>() <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><String>() }
 }