azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KT-25383 fix

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2019-02-07 18:22:45 +03:00
parent 7b55e72583
commit f186c83b15
6 changed files with 79 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/declarationChecks/namedFunAsLastExpressionInBlock.kt
Vendored
+21 -5
View File
@@ -27,15 +27,15 @@ fun test() {
<!SYNTAX!><!>fun named7() = 1
val x3 = when (1) {
0 -> <!EXPECTED_TYPE_MISMATCH!>fun named8(): Int {return 1}<!>
else -> <!EXPECTED_TYPE_MISMATCH!>fun named9() = 1<!>
0 -> <!OI;EXPECTED_TYPE_MISMATCH!>fun <!NI;ANONYMOUS_FUNCTION_WITH_NAME!>named8<!>(): Int {return 1}<!>
else -> <!OI;EXPECTED_TYPE_MISMATCH!>fun <!NI;ANONYMOUS_FUNCTION_WITH_NAME!>named9<!>() = 1<!>
}
val x31 = when (1) {
0 -> {
<!EXPECTED_TYPE_MISMATCH!>fun named10(): Int {return 1}<!>
<!OI;EXPECTED_TYPE_MISMATCH!>fun named10(): Int {return 1}<!>
}
else -> <!EXPECTED_TYPE_MISMATCH!>fun named11() = 1<!>
else -> <!OI;EXPECTED_TYPE_MISMATCH!>fun <!NI;ANONYMOUS_FUNCTION_WITH_NAME!>named11<!>() = 1<!>
}
val x4 = {
@@ -45,15 +45,31 @@ fun test() {
x4 checkType { _<Function1<Int, Unit>>() }
<!UNUSED_LAMBDA_EXPRESSION!>{ y: Int -> fun named14(): Int {return 1} }<!>
val b = (fun <!ANONYMOUS_FUNCTION_WITH_NAME!>named15<!>(): Boolean { return true })()
baz(fun <!ANONYMOUS_FUNCTION_WITH_NAME!>named16<!>(){})
}
fun bar() = fun <!ANONYMOUS_FUNCTION_WITH_NAME!>named<!>() {}
fun <T> run(block: () -> T): T = null!!
fun run2(block: () -> Unit): Unit = null!!
fun baz(obj: Any?) {}
fun success() {
run { fun named1() = 1 }
run2 { fun named2() = 1 }
val x = run { fun named3() = 1 }
x checkType { <!NI;DEBUG_INFO_UNRESOLVED_WITH_TARGET, NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>_<!><Unit>() }
x checkType { _<Unit>() }
val y = when (1) {
0 -> {
<!OI;EXPECTED_TYPE_MISMATCH!>fun named4(): Int {return 1}<!>
}
else -> {
<!OI;EXPECTED_TYPE_MISMATCH!>fun named5(): Int {return 1}<!>
}
}
y checkType { <!OI;TYPE_MISMATCH!>_<!><Unit>() }
}
compiler/testData/diagnostics/tests/declarationChecks/namedFunAsLastExpressionInBlock.txt
Vendored
+2
View File
@@ -1,5 +1,7 @@
package
public fun bar(): () -> kotlin.Unit
public fun baz(/*0*/ obj: kotlin.Any?): kotlin.Unit
public fun foo(/*0*/ block: () -> () -> kotlin.Int): kotlin.Unit
public fun </*0*/ T> run(/*0*/ block: () -> T): T
public fun run2(/*0*/ block: () -> kotlin.Unit): kotlin.Unit