KT-10717 Type inference for lambda with local return

#KT-10717 Fixed
2016-06-09 20:22:29 +03:00
parent da01e4a57c
commit 585dcbf1f3
9 changed files with 126 additions and 13 deletions
@@ -32,15 +32,15 @@ fun testReturnFromAnonFun() =

 fun <!IMPLICIT_NOTHING_RETURN_TYPE!>testReturn1<!>() =
        run {
-            return if (true) <!IMPLICIT_CAST_TO_ANY!>42<!>
-                   else <!IMPLICIT_CAST_TO_ANY!>println()<!>
+            return <!TYPE_MISMATCH!>if (true) <!IMPLICIT_CAST_TO_ANY!>42<!>
+                   else <!IMPLICIT_CAST_TO_ANY!>println()<!><!>
        }

 fun <!IMPLICIT_NOTHING_RETURN_TYPE!>testReturn2<!>() =
        run {
-            return if (true) <!IMPLICIT_CAST_TO_ANY!>42<!>
+            return <!TYPE_MISMATCH!>if (true) <!IMPLICIT_CAST_TO_ANY!>42<!>
                   else if (true) <!IMPLICIT_CAST_TO_ANY!>42<!>
-                   else <!IMPLICIT_CAST_TO_ANY!>println()<!>
+                   else <!IMPLICIT_CAST_TO_ANY!>println()<!><!>
        }

 fun testUsage1() =