From 23d492646d69625a8431226c30242beec6b4a6ea Mon Sep 17 00:00:00 2001
From: Dmitriy Novozhilov <dmitriy.novozhilov@jetbrains.com>
Date: Tue, 5 Nov 2019 10:57:45 +0300
Subject: [PATCH] [FIR] Update testdata of SAM conversions diagnostics tests
 after lambda resolution fix

---
 .../resolve/samConstructors/genericSam.txt       |  2 +-
 .../genericSamInferenceFromExpectType.kt         |  2 +-
 .../genericSamInferenceFromExpectType.txt        |  2 +-
 .../resolve/samConversions/genericSam.kt         |  2 +-
 .../resolve/samConversions/genericSam.txt        |  4 ++--
 .../testData/resolve/samConversions/kotlinSam.kt | 12 ++++++------
 .../resolve/samConversions/kotlinSam.txt         | 16 ++++++++--------
 .../samConversions/notSamBecauseOfSupertype.kt   |  4 ++--
 .../samConversions/notSamBecauseOfSupertype.txt  |  8 ++++----
 9 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/compiler/fir/resolve/testData/resolve/samConstructors/genericSam.txt b/compiler/fir/resolve/testData/resolve/samConstructors/genericSam.txt
index 1a4a5cc8e4a..64f18bea829 100644
--- a/compiler/fir/resolve/testData/resolve/samConstructors/genericSam.txt
+++ b/compiler/fir/resolve/testData/resolve/samConstructors/genericSam.txt
@@ -4,7 +4,7 @@ FILE: main.kt
             R|<local>/x|.R|kotlin/Int.toInt|().R|kotlin/Any.toString|()
         }
         )
-        R|/MyFunction|<R|kotlin/Any?|, R|ft<kotlin/String, kotlin/String>|>(<L> = MyFunction@fun <anonymous>(x: R|kotlin/Int|): R|kotlin/String| {
+        R|/MyFunction|<R|kotlin/Int|, R|ft<kotlin/String, kotlin/String>|>(<L> = MyFunction@fun <anonymous>(x: R|kotlin/Int|): R|kotlin/String| {
             R|<local>/x|.R|kotlin/Any.toString|()
         }
         )
diff --git a/compiler/fir/resolve/testData/resolve/samConstructors/genericSamInferenceFromExpectType.kt b/compiler/fir/resolve/testData/resolve/samConstructors/genericSamInferenceFromExpectType.kt
index 06e0db10fd4..dda848e2b85 100644
--- a/compiler/fir/resolve/testData/resolve/samConstructors/genericSamInferenceFromExpectType.kt
+++ b/compiler/fir/resolve/testData/resolve/samConstructors/genericSamInferenceFromExpectType.kt
@@ -18,7 +18,7 @@ fun main() {
         x.toInt().toString()
     })
 
-    foo2(MyFunction { x: Int ->
+    <!INAPPLICABLE_CANDIDATE!>foo2<!>(MyFunction { x: Int ->
         x.toString()
     })
 
diff --git a/compiler/fir/resolve/testData/resolve/samConstructors/genericSamInferenceFromExpectType.txt b/compiler/fir/resolve/testData/resolve/samConstructors/genericSamInferenceFromExpectType.txt
index 06cf1b4937f..14283069be5 100644
--- a/compiler/fir/resolve/testData/resolve/samConstructors/genericSamInferenceFromExpectType.txt
+++ b/compiler/fir/resolve/testData/resolve/samConstructors/genericSamInferenceFromExpectType.txt
@@ -14,7 +14,7 @@ FILE: main.kt
             R|<local>/x|.R|kotlin/Number.toInt|().R|kotlin/Any.toString|()
         }
         ))
-        R|/foo2|(R|/MyFunction|<R|kotlin/Number|, R|ft<kotlin/String, kotlin/String>|>(<L> = MyFunction@fun <anonymous>(x: R|kotlin/Int|): R|kotlin/String| {
+        <Inapplicable(INAPPLICABLE): [/foo2]>#(R?C|/MyFunction|(<L> = MyFunction@fun <anonymous>(x: R|kotlin/Int|): R|kotlin/String| {
             R|<local>/x|.R|kotlin/Any.toString|()
         }
         ))
diff --git a/compiler/fir/resolve/testData/resolve/samConversions/genericSam.kt b/compiler/fir/resolve/testData/resolve/samConversions/genericSam.kt
index 4dae57a69fc..c4eac6be67d 100644
--- a/compiler/fir/resolve/testData/resolve/samConversions/genericSam.kt
+++ b/compiler/fir/resolve/testData/resolve/samConversions/genericSam.kt
@@ -21,7 +21,7 @@ fun main() {
         x.toInt().toString()
     }
 
-    JavaUsage.foo2 { x: Int ->
+    JavaUsage.<!INAPPLICABLE_CANDIDATE!>foo2<!> { x: Int ->
         x.toString()
     }
 
diff --git a/compiler/fir/resolve/testData/resolve/samConversions/genericSam.txt b/compiler/fir/resolve/testData/resolve/samConversions/genericSam.txt
index 20000fa9ccc..5fe13a5a916 100644
--- a/compiler/fir/resolve/testData/resolve/samConversions/genericSam.txt
+++ b/compiler/fir/resolve/testData/resolve/samConversions/genericSam.txt
@@ -8,8 +8,8 @@ FILE: main.kt
             R|<local>/x|.R|kotlin/Number.toInt|().R|kotlin/Any.toString|()
         }
         )
-        Q|JavaUsage|.R|/JavaUsage.foo2|(<L> = foo2@fun <anonymous>(x: R|kotlin/Int|): R|ft<kotlin/CharSequence, kotlin/CharSequence?>!| {
-            R|<local>/x|.R|kotlin/Any.toString|()
+        Q|JavaUsage|.<Inapplicable(INAPPLICABLE): [/JavaUsage.foo2]>#(<L> = foo2@fun <implicit>.<anonymous>(x: R|kotlin/Int|): <implicit> {
+            x#.toString#()
         }
         )
         Q|JavaUsage|.R|/JavaUsage.foo3|<R|ft<kotlin/Int, kotlin/Int>|, R|ft<kotlin/String, kotlin/String>|>(foo3@fun <anonymous>(x: R|ft<kotlin/Int, kotlin/Int>|): R|kotlin/Unit| {
diff --git a/compiler/fir/resolve/testData/resolve/samConversions/kotlinSam.kt b/compiler/fir/resolve/testData/resolve/samConversions/kotlinSam.kt
index 3c3884cb04d..9c845a22a6e 100644
--- a/compiler/fir/resolve/testData/resolve/samConversions/kotlinSam.kt
+++ b/compiler/fir/resolve/testData/resolve/samConversions/kotlinSam.kt
@@ -22,7 +22,7 @@ interface Derived : Super {
 fun foo1(m: MyRunnable) {}
 fun foo2(m: WithProperty) {}
 fun foo3(m: TwoAbstract) {}
-fun foo3(m: Derived) {}
+fun foo4(m: Derived) {}
 
 fun main() {
     val f = { t: Int -> t > 1}
@@ -30,13 +30,13 @@ fun main() {
     foo1 { x -> x > 1 }
     foo1(f)
 
-    foo2 { x -> x > 1 }
+    <!INAPPLICABLE_CANDIDATE!>foo2<!> { x -> x > 1 }
     <!INAPPLICABLE_CANDIDATE!>foo2<!>(f)
 
-    <!AMBIGUITY!>foo3<!> { x -> x > 1 }
-    foo3(f)
+    <!INAPPLICABLE_CANDIDATE!>foo3<!> { x -> x > 1 }
+    <!INAPPLICABLE_CANDIDATE!>foo3<!>(f)
 
-    <!UNRESOLVED_REFERENCE!>foo4<!> { x -> x > 1 }
-    <!UNRESOLVED_REFERENCE!>foo4<!>(f)
+    foo4 { x -> x > 1 }
+    foo4(f)
 
 }
diff --git a/compiler/fir/resolve/testData/resolve/samConversions/kotlinSam.txt b/compiler/fir/resolve/testData/resolve/samConversions/kotlinSam.txt
index d505ed77f91..eb74ffb28f4 100644
--- a/compiler/fir/resolve/testData/resolve/samConversions/kotlinSam.txt
+++ b/compiler/fir/resolve/testData/resolve/samConversions/kotlinSam.txt
@@ -26,7 +26,7 @@ FILE: kotlinSam.kt
     }
     public final fun foo3(m: R|TwoAbstract|): R|kotlin/Unit| {
     }
-    public final fun foo3(m: R|Derived|): R|kotlin/Unit| {
+    public final fun foo4(m: R|Derived|): R|kotlin/Unit| {
     }
     public final fun main(): R|kotlin/Unit| {
         lval f: R|kotlin/Function1<kotlin/Int, kotlin/Boolean>| = fun <anonymous>(t: R|kotlin/Int|): kotlin/Boolean {
@@ -38,19 +38,19 @@ FILE: kotlinSam.kt
         }
         )
         R|/foo1|(R|<local>/f|)
-        R|/foo2|(<L> = foo2@fun <anonymous>(x: R|kotlin/Nothing|): kotlin/Boolean {
-            >(R|<local>/x|, Int(1))
+        <Inapplicable(INAPPLICABLE): [/foo2]>#(<L> = foo2@fun <implicit>.<anonymous>(x: <implicit>): <implicit> {
+            >(x#, Int(1))
         }
         )
         <Inapplicable(INAPPLICABLE): [/foo2]>#(R|<local>/f|)
-        <Ambiguity: foo3, [/foo3, /foo3]>#(<L> = foo3@fun <implicit>.<anonymous>(x: <implicit>): <implicit> {
+        <Inapplicable(INAPPLICABLE): [/foo3]>#(<L> = foo3@fun <implicit>.<anonymous>(x: <implicit>): <implicit> {
             >(x#, Int(1))
         }
         )
-        R|/foo3|(R|<local>/f|)
-        <Unresolved name: foo4>#(<L> = foo4@fun <implicit>.<anonymous>(x: <implicit>): <implicit> {
-            >(x#, Int(1))
+        <Inapplicable(INAPPLICABLE): [/foo3]>#(R|<local>/f|)
+        R|/foo4|(<L> = foo4@fun <anonymous>(x: R|kotlin/Int|): R|kotlin/Boolean| {
+            >(R|<local>/x|, Int(1))
         }
         )
-        <Unresolved name: foo4>#(R|<local>/f|)
+        R|/foo4|(R|<local>/f|)
     }
diff --git a/compiler/fir/resolve/testData/resolve/samConversions/notSamBecauseOfSupertype.kt b/compiler/fir/resolve/testData/resolve/samConversions/notSamBecauseOfSupertype.kt
index 4d5d49e461e..56d5ac901be 100644
--- a/compiler/fir/resolve/testData/resolve/samConversions/notSamBecauseOfSupertype.kt
+++ b/compiler/fir/resolve/testData/resolve/samConversions/notSamBecauseOfSupertype.kt
@@ -18,12 +18,12 @@ public class JavaUsage {
 fun foo(m: MyRunnable) {}
 
 fun main() {
-    JavaUsage.foo {
+    JavaUsage.<!INAPPLICABLE_CANDIDATE!>foo<!> {
             x ->
         x > 1
     }
 
-    JavaUsage.foo({ <!UNRESOLVED_REFERENCE!>it<!> > 1 })
+    JavaUsage.<!INAPPLICABLE_CANDIDATE!>foo<!>({ it > 1 })
 
     val x = { x: Int -> x > 1 }
 
diff --git a/compiler/fir/resolve/testData/resolve/samConversions/notSamBecauseOfSupertype.txt b/compiler/fir/resolve/testData/resolve/samConversions/notSamBecauseOfSupertype.txt
index bb583f19e12..c2a0de5060f 100644
--- a/compiler/fir/resolve/testData/resolve/samConversions/notSamBecauseOfSupertype.txt
+++ b/compiler/fir/resolve/testData/resolve/samConversions/notSamBecauseOfSupertype.txt
@@ -2,12 +2,12 @@ FILE: main.kt
     public final fun foo(m: R|MyRunnable|): R|kotlin/Unit| {
     }
     public final fun main(): R|kotlin/Unit| {
-        Q|JavaUsage|.R|/JavaUsage.foo|(<L> = foo@fun <anonymous>(x: R|kotlin/Nothing|): kotlin/Boolean {
-            >(R|<local>/x|, Int(1))
+        Q|JavaUsage|.<Inapplicable(INAPPLICABLE): [/JavaUsage.foo]>#(<L> = foo@fun <implicit>.<anonymous>(x: <implicit>): <implicit> {
+            >(x#, Int(1))
         }
         )
-        Q|JavaUsage|.R|/JavaUsage.foo|(foo@fun <anonymous>(): kotlin/Boolean {
-            >(<Unresolved name: it>#, Int(1))
+        Q|JavaUsage|.<Inapplicable(INAPPLICABLE): [/JavaUsage.foo]>#(foo@fun <implicit>.<anonymous>(): <implicit> {
+            >(it#, Int(1))
         }
         )
         lval x: R|kotlin/Function1<kotlin/Int, kotlin/Boolean>| = fun <anonymous>(x: R|kotlin/Int|): kotlin/Boolean {