Write lineNumber for function literal with void return value

#KT-9865 Fixed
This commit is contained in:
Natalia Ukhorskaya
2015-11-24 12:21:29 +03:00
parent 4a2e4312ea
commit cb80a3e83a
12 changed files with 37 additions and 28 deletions
@@ -4,8 +4,7 @@ fun main(args: Array<String>) {
val a = A()
// EXPRESSION: it
// RESULT: 2: I
// STEP_INTO: 7
//Breakpoint!
//Breakpoint! (lambdaOrdinal = 1)
a.foo(1) { a }.foo(2) { a }
}
@@ -16,14 +16,14 @@ fun main(args: Array<String>) {
// RESUME: 1
val c = inlineFunVoid {
// STEP_OVER: 1
// STEP_OVER: 2
//Breakpoint!
val aa = 1
}
// RESUME: 1
val d = simpleFunVoid {
// STEP_OVER: 3
// STEP_OVER: 4
//Breakpoint!
val aa = 1
}
@@ -23,23 +23,23 @@ class Derived: Base<String>() {
class A {
fun test() {
lambda {
val a = 1
1
}
}
fun lambda(f: () -> Unit) {
f()
fun lambda(f: () -> Int): Int {
return f()
}
companion object {
fun test() {
lambda {
val a = 1
1
}
}
fun lambda(f: () -> Unit) {
f()
fun lambda(f: () -> Int): Int {
return f()
}
}
}
@@ -8,7 +8,7 @@ fun main(args: Array<String>) {
test(3)
}
inline fun f1(f: () -> Unit) {
inline fun f1(f: () -> Int) {
val a = 1
f2 {
f()
@@ -16,10 +16,10 @@ inline fun f1(f: () -> Unit) {
val b = 2
}
inline fun f2(f: () -> Unit) {
inline fun f2(f: () -> Int): Int {
val a = 1
f()
val b = 2
return 2
}
fun test(i: Int) = 1