Resolve anonymous functions in block as expression

#KT-7265 Fixed
2016-03-18 18:34:37 +03:00
parent 77e37ff75d
commit 16736e3a0e
13 changed files with 171 additions and 15 deletions
@@ -0,0 +1,58 @@
+// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE
+// !CHECK_TYPE
+fun foo(block: () -> (() -> Int)) {}
+
+fun test() {
+    val x = fun <!ANONYMOUS_FUNCTION_WITH_NAME!>named1<!>(x: Int): Int { return 1 }
+    x checkType { _<Function1<Int, Int>>() }
+
+    foo { <!EXPECTED_TYPE_MISMATCH(\(\) -> Int)!>fun named2(): Int {return 1}<!> }
+    foo({ <!EXPECTED_TYPE_MISMATCH!>fun named3() = 1<!> })
+
+    val x1 =
+        if (1 == 1)
+            // TODO: Diagnostic content could be better
+            <!EXPECTED_TYPE_MISMATCH(\(\) -> Int)!>fun named4(): Int {return 1}<!>
+        else
+            <!EXPECTED_TYPE_MISMATCH!>fun named5() = 1<!>
+
+    val x2 =
+            if (1 == 1) {
+                <!EXPECTED_TYPE_MISMATCH!>fun named6(): Int {
+                    return 1
+                }<!>
+            }
+            else
+                <!EXPECTED_TYPE_MISMATCH!>fun named7() = 1<!>
+
+    val x3 = when (1) {
+        0 -> <!EXPECTED_TYPE_MISMATCH!>fun named8(): Int {return 1}<!>
+        else -> <!EXPECTED_TYPE_MISMATCH!>fun named9() = 1<!>
+    }
+
+    val x31 = when (1) {
+        0 -> {
+            <!EXPECTED_TYPE_MISMATCH!>fun named10(): Int {return 1}<!>
+        }
+        else -> <!EXPECTED_TYPE_MISMATCH!>fun named11() = 1<!>
+    }
+
+    val x4 = {
+        y: Int -> fun named12(): Int {return 1}
+    }
+
+    x4 checkType { _<Function1<Int, Unit>>() }
+
+    <!UNUSED_LAMBDA_EXPRESSION!>{ y: Int -> fun named14(): Int {return 1} }<!>
+}
+
+fun <T> run(block: () -> T): T = null!!
+fun run2(block: () -> Unit): Unit = null!!
+
+fun success() {
+    run { fun named1() = 1 }
+    run2 { fun named2() = 1 }
+
+    val x = run { fun named3() = 1 }
+    x checkType { _<Unit>() }
+}