K2: Fix current behavior for KT-37375 and KT-58943

compiler/testData/diagnostics/tests/resolve/invoke/closeInvokesFarVariable.fir.kt

@@ -0,0 +1,17 @@
+// ISSUE: KT-37375
+
+val foo: Any = Any()
+
+fun bar() {
+    operator fun Any.invoke(): String = ""
+
+    fun baz() {
+        operator fun Any.invoke(): Int = 1
+
+        fun barbaz() {
+            takeInt(<!OVERLOAD_RESOLUTION_AMBIGUITY!>foo<!>())
+        }
+    }
+}
+
+fun takeInt(x: Int) {}

compiler/testData/diagnostics/tests/resolve/invoke/closeInvokesFarVariable.kt

@@ -0,0 +1,17 @@
+// ISSUE: KT-37375
+
+val foo: Any = Any()
+
+fun bar() {
+    operator fun Any.invoke(): String = ""
+
+    fun baz() {
+        operator fun Any.invoke(): Int = 1
+
+        fun barbaz() {
+            takeInt(foo())
+        }
+    }
+}
+
+fun takeInt(x: Int) {}

compiler/testData/diagnostics/tests/resolve/invoke/closerVariableMatterMore.fir.kt

@@ -0,0 +1,14 @@
+// ISSUE: KT-37375
+
+fun takeDouble(x: Double) {}
+
+val bar: Int = 1
+operator fun Double.invoke(): Double = 1.0 // (1)
+
+fun test_1() {
+    val bar: Double = 2.0
+    operator fun Int.invoke(): Int = 1  // (2)
+
+    val res = bar() // should resolve to (1)
+    takeDouble(<!ARGUMENT_TYPE_MISMATCH!>res<!>) // should be OK
+}

compiler/testData/diagnostics/tests/resolve/invoke/closerVariableMatterMore.kt

@@ -0,0 +1,14 @@
+// ISSUE: KT-37375
+
+fun takeDouble(x: Double) {}
+
+val bar: Int = 1
+operator fun Double.invoke(): Double = 1.0 // (1)
+
+fun test_1() {
+    val bar: Double = 2.0
+    operator fun Int.invoke(): Int = 1  // (2)
+
+    val res = bar() // should resolve to (1)
+    takeDouble(res) // should be OK
+}

compiler/testData/diagnostics/tests/resolve/invoke/implicitAndInvokeExtensionPriority.fir.kt

@@ -0,0 +1,16 @@
+// ISSUE: KT-58943
+
+class A {
+    fun bar() {
+        val foo: String.() -> Int = { 1 } // (1)
+        fun String.foo(): String = "" // (2)
+        with("2") {
+            // In K1, foo variable + invokeExtension on implicit receiver is more prioritized than `foo() + implicit receiver`
+            // So, for now, we're going to preserve that behavior in K2
+            // For design, see KT-59528
+            takeInt(<!ARGUMENT_TYPE_MISMATCH!>foo()<!>)
+        }
+    }
+}
+
+fun takeInt(x: Int) {}

compiler/testData/diagnostics/tests/resolve/invoke/implicitAndInvokeExtensionPriority.kt

@@ -0,0 +1,16 @@
+// ISSUE: KT-58943
+
+class A {
+    fun bar() {
+        val foo: String.() -> Int = { 1 } // (1)
+        fun String.foo(): String = "" // (2)
+        with("2") {
+            // In K1, foo variable + invokeExtension on implicit receiver is more prioritized than `foo() + implicit receiver`
+            // So, for now, we're going to preserve that behavior in K2
+            // For design, see KT-59528
+            takeInt(foo())
+        }
+    }
+}
+
+fun takeInt(x: Int) {}