Fix stepping for inline functions inside when, if, try

idea/testData/debugger/tinyApp/outs/stepOverIfWithInline.out

@@ -0,0 +1,28 @@
+LineBreakpoint created at stepOverIfWithInline.kt:5
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stepOverIfWithInline.StepOverIfWithInlinePackage
+Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+stepOverIfWithInline.kt:5
+stepOverIfWithInline.kt:7
+stepOverIfWithInline.kt:11
+stepOverIfWithInline.kt:7
+stepOverIfWithInline.kt:15
+stepOverIfWithInline.kt:18
+stepOverIfWithInline.kt:15
+stepOverIfWithInline.kt:21
+stepOverIfWithInline.kt:41
+stepOverIfWithInline.kt:21
+stepOverIfWithInline.kt:24
+stepOverIfWithInline.kt:25
+stepOverIfWithInline.kt:24
+stepOverIfWithInline.kt:28
+stepOverIfWithInline.kt:41
+stepOverIfWithInline.kt:28
+stepOverIfWithInline.kt:32
+stepOverIfWithInline.kt:41
+stepOverIfWithInline.kt:32
+stepOverIfWithInline.kt:36
+stepOverIfWithInline.kt:32
+stepOverIfWithInline.kt:38
+Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+
+Process finished with exit code 0

idea/testData/debugger/tinyApp/outs/stepOverInlineFunctionInReturn.out

@@ -0,0 +1,10 @@
+LineBreakpoint created at stepOverInlineFunctionInReturn.kt:9
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stepOverInlineFunctionInReturn.StepOverInlineFunctionInReturnPackage
+Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+stepOverInlineFunctionInReturn.kt:9
+stepOverInlineFunctionInReturn.kt:10
+stepOverInlineFunctionInReturn.kt:4
+stepOverInlineFunctionInReturn.kt:5
+Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+
+Process finished with exit code 0

idea/testData/debugger/tinyApp/outs/stepOverInlinedLambda.out

@@ -11,7 +11,8 @@ stepOverInlinedLambda.kt:19
 stepOverInlinedLambda.kt:20
 stepOverInlinedLambda.kt:23
 stepOverInlinedLambda.kt:29
-stepOverInlinedLambda.kt:30
+stepOverInlinedLambda.kt:31
+stepOverInlinedLambda.kt:32
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
 Process finished with exit code 0

idea/testData/debugger/tinyApp/outs/stepOverTryCatchWithInline.out

@@ -0,0 +1,22 @@
+LineBreakpoint created at stepOverTryCatchWithInline.kt:14
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stepOverTryCatchWithInline.StepOverTryCatchWithInlinePackage
+Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+stepOverTryCatchWithInline.kt:14
+stepOverTryCatchWithInline.kt:16
+stepOverTryCatchWithInline.kt:17
+stepOverTryCatchWithInline.kt:48
+stepOverTryCatchWithInline.kt:17
+stepOverTryCatchWithInline.kt:24
+stepOverTryCatchWithInline.kt:25
+stepOverTryCatchWithInline.kt:28
+stepOverTryCatchWithInline.kt:35
+stepOverTryCatchWithInline.kt:36
+stepOverTryCatchWithInline.kt:48
+stepOverTryCatchWithInline.kt:36
+stepOverTryCatchWithInline.kt:39
+stepOverTryCatchWithInline.kt:43
+stepOverTryCatchWithInline.kt:8
+stepOverTryCatchWithInline.kt:10
+Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+
+Process finished with exit code 0

idea/testData/debugger/tinyApp/outs/stepOverWhenInReturn.out

@@ -0,0 +1,13 @@
+LineBreakpoint created at stepOverWhenInReturn.kt:10
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stepOverWhenInReturn.StepOverWhenInReturnPackage
+Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+stepOverWhenInReturn.kt:10
+stepOverWhenInReturn.kt:11
+stepOverWhenInReturn.kt:17
+stepOverWhenInReturn.kt:11
+stepOverWhenInReturn.kt:10
+stepOverWhenInReturn.kt:4
+stepOverWhenInReturn.kt:5
+Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+
+Process finished with exit code 0

idea/testData/debugger/tinyApp/outs/stepOverWhenWithInline.out

@@ -0,0 +1,48 @@
+LineBreakpoint created at stepOverWhenWithInline.kt:5
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stepOverWhenWithInline.StepOverWhenWithInlinePackage
+Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+stepOverWhenWithInline.kt:5
+stepOverWhenWithInline.kt:8
+stepOverWhenWithInline.kt:9
+stepOverWhenWithInline.kt:83
+stepOverWhenWithInline.kt:9
+stepOverWhenWithInline.kt:7
+stepOverWhenWithInline.kt:14
+stepOverWhenWithInline.kt:17
+stepOverWhenWithInline.kt:18
+stepOverWhenWithInline.kt:13
+stepOverWhenWithInline.kt:26
+stepOverWhenWithInline.kt:83
+stepOverWhenWithInline.kt:26
+stepOverWhenWithInline.kt:27
+stepOverWhenWithInline.kt:83
+stepOverWhenWithInline.kt:27
+stepOverWhenWithInline.kt:25
+stepOverWhenWithInline.kt:32
+stepOverWhenWithInline.kt:34
+stepOverWhenWithInline.kt:83
+stepOverWhenWithInline.kt:34
+stepOverWhenWithInline.kt:32
+stepOverWhenWithInline.kt:38
+stepOverWhenWithInline.kt:43
+stepOverWhenWithInline.kt:38
+stepOverWhenWithInline.kt:51
+stepOverWhenWithInline.kt:52
+stepOverWhenWithInline.kt:83
+stepOverWhenWithInline.kt:52
+stepOverWhenWithInline.kt:51
+stepOverWhenWithInline.kt:58
+stepOverWhenWithInline.kt:83
+stepOverWhenWithInline.kt:58
+stepOverWhenWithInline.kt:57
+stepOverWhenWithInline.kt:64
+stepOverWhenWithInline.kt:65
+stepOverWhenWithInline.kt:63
+stepOverWhenWithInline.kt:76
+stepOverWhenWithInline.kt:83
+stepOverWhenWithInline.kt:76
+stepOverWhenWithInline.kt:75
+stepOverWhenWithInline.kt:80
+Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+
+Process finished with exit code 0

idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverIfWithInline.kt

@@ -0,0 +1,47 @@
+package stepOverIfWithInline
+
+fun main(args: Array<String>) {
+    //Breakpoint!
+    val prop = 1
+    // False with braces
+    val a = if (1 > 2) {
+        foo { test(1) }
+    }
+    else {
+        foo { test(1) }
+    }
+
+    // False without braces
+    val b = if (1 > 2)
+        foo { test(1) }
+    else
+        foo { test(1) }
+
+    // One line
+    val c = if (1 > 2) foo { test(1) } else foo { test(1) }
+
+    // Else on next line, false
+    val d = if (1 > 2) foo { test(1) }
+            else foo { test(1) }
+
+    // Else on next line, true
+    val e = if (1 < 2) foo { test(1) }
+            else foo { test(1) }
+
+    // Inline function call in condition
+    val f = if (foo { test(1) } > 2) {
+        foo { test(1) }
+    }
+    else {
+        foo { test(1) }
+    }
+}
+
+inline fun foo(f: () -> Int): Int {
+    val a = 1
+    return f()
+}
+
+fun test(i: Int) = 1
+
+// STEP_OVER: 30

idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverInlineFunctionInReturn.kt

@@ -0,0 +1,22 @@
+package stepOverInlineFunctionInReturn
+
+fun main(args: Array<String>) {
+    f()
+}
+
+fun f(): Int {
+    //Breakpoint!
+    val a = 1
+    return foo {
+        test(2)
+    }
+}
+
+inline fun foo(f: () -> Int): Int {
+    val a = 1
+    return f()
+}
+
+fun test(i: Int) = 1
+
+// STEP_OVER: 4

idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverInlinedLambda.kt

@@ -27,6 +27,8 @@ fun main(args: Array<String>) {
     })
 
     val b = foo { test(1) }
+
+    foo(fun (){ test(1) })
 }
 
 inline fun foo(f: () -> Unit) {
@@ -47,4 +49,4 @@ class A {
 
 fun test(i: Int) = 1
 
-// STEP_OVER: 11
+// STEP_OVER: 13

idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverTryCatchWithInline.kt

@@ -0,0 +1,54 @@
+package stepOverTryCatchWithInline
+
+fun main(args: Array<String>) {
+    try {
+        bar()
+    }
+    catch(e: Exception) {
+        val a = 1
+    }
+}
+
+fun bar() {
+    //Breakpoint!
+    val prop = 1
+    // Try
+    try {
+        foo { test(1) }
+    }
+    catch(e: Exception) {
+        foo { test(1) }
+    }
+
+    // Many catch clauses
+    try {
+        throw IllegalStateException()
+    }
+    catch(e: IllegalStateException) {
+        foo { test(1) }
+    }
+    catch(e: Exception) {
+        foo { test(1) }
+    }
+
+    // exception in lambda
+    try {
+        foo { throw IllegalStateException() }
+    }
+    catch(e: Exception) {
+        foo { test(1) }
+    }
+
+    // Exception without catch
+    foo { throw IllegalStateException() }
+    val prop2 = 1
+}
+
+inline fun foo(f: () -> Int): Int {
+    val a = 1
+    return f()
+}
+
+fun test(i: Int) = 1
+
+// STEP_OVER: 30

idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverWhenInReturn.kt

@@ -0,0 +1,23 @@
+package stepOverWhenInReturn
+
+fun main(args: Array<String>) {
+    whenInReturn()
+}
+
+fun whenInReturn(): Int {
+    val a = 1
+    //Breakpoint!
+    return when(a) {
+        1 -> foo { 1 }
+        else -> 3
+    }
+}
+
+inline fun foo(f: () -> Int): Int {
+    val a = 1
+    return f()
+}
+
+fun test(i: Int) = 1
+
+// STEP_OVER: 6

idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverWhenWithInline.kt

@@ -0,0 +1,89 @@
+package stepOverWhenWithInline
+
+fun main(args: Array<String>) {
+    //Breakpoint!
+    val prop = 1
+    // Break after second
+    val a = when {
+        1 > 2 -> foo { test(1) }
+        2 > 1 -> foo { test(1) }
+        else -> foo { test(1) }
+    }
+
+    val b = when {
+        1 > 2 -> {
+            foo { test(1) }
+        }
+        2 > 1 -> {
+            foo { test(1) }
+        }
+        else -> {
+            foo { test(1) }
+        }
+    }
+
+    val c = when {
+        foo { test(1) } > 2 -> 1
+        2 > foo { test(1) } -> 2
+        else -> foo { test(1) }
+    }
+
+    // When with expression
+    val a1 = when(prop) {
+        2 -> foo { test(1) }
+        1 -> foo { test(1) }
+        else -> foo { test(1) }
+    }
+
+    val b1 = when(prop) {
+        2 -> {
+            foo { test(1) }
+        }
+        1 -> {
+            foo { test(1) }
+        }
+        else -> {
+            foo { test(1) }
+        }
+    }
+
+    // Break after first
+    val c1 = when(prop) {
+        foo { test(1) } -> 1
+        foo { test(2) } -> 2
+        else -> foo { test(1) }
+    }
+
+    val a2 = when {
+        2 > 1 -> foo { test(1) }
+        1 > 2 -> foo { test(1) }
+        else -> foo { test(1) }
+    }
+
+    val b2 = when {
+        2 > 1 -> {
+            foo { test(1) }
+        }
+        1 > 2 -> {
+            foo { test(1) }
+        }
+        else -> {
+            foo { test(1) }
+        }
+    }
+
+    val c2 = when {
+        2 > foo { test(1) } -> 2
+        foo { test(1) } > 2 -> 1
+        else -> foo { test(1) }
+    }
+}
+
+inline fun foo(f: () -> Int): Int {
+    val a = 1
+    return f()
+}
+
+fun test(i: Int) = i
+
+// STEP_OVER: 50