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

Revert "Debugger: Fix breakpoints and stepping for inline-only function lambda arguments (#KT-23064)"

Browse Source
This commit is contained in:
Yan Zhulanow
2018-05-14 16:39:29 +03:00
parent d851c8679a
commit 5f43808cfd
20 changed files with 55 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/debugger/tinyApp/src/stepping/custom/inlineOnlyLambdas.kt
Vendored
-49
View File
@@ -1,49 +0,0 @@
package inlineOnlyLambdas
class Test
fun test() {}
fun main(args: Array<String>) {
val data = Test()
//Breakpoint! (lambdaOrdinal = 1)
data.onelinerApply { test() }
//Breakpoint! (lambdaOrdinal = 1)
data.multiLineApply { test() }
//Breakpoint! (lambdaOrdinal = 1)
data.onelinerApply2 { test() }
//Breakpoint! (lambdaOrdinal = 1)
data.multiLineApply2 { test() }
//Breakpoint!
data.withoutLambdaParams()
}
@Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
@kotlin.internal.InlineOnly
inline fun <T> T.withoutLambdaParams(): T {
return this
}
@Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
@kotlin.internal.InlineOnly
inline fun <T> T.onelinerApply(block: T.() -> Unit): T { block(); return this }
@Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
@kotlin.internal.InlineOnly
inline fun <T> T.multiLineApply(block: T.() -> Unit): T {
block();
return this
}
inline fun <T> T.onelinerApply2(block: T.() -> Unit): T { block(); return this }
inline fun <T> T.multiLineApply2(block: T.() -> Unit): T {
block();
return this
}
// RESUME: 5
idea/testData/debugger/tinyApp/src/stepping/custom/inlineOnlyLambdas.out
Vendored
-15
View File
@@ -1,15 +0,0 @@
LineBreakpoint created at inlineOnlyLambdas.kt:10 lambdaOrdinal = 1
LineBreakpoint created at inlineOnlyLambdas.kt:13 lambdaOrdinal = 1
LineBreakpoint created at inlineOnlyLambdas.kt:16 lambdaOrdinal = 1
LineBreakpoint created at inlineOnlyLambdas.kt:19 lambdaOrdinal = 1
LineBreakpoint created at inlineOnlyLambdas.kt:22
Run Java
Connected to the target VM
inlineOnlyLambdas.kt:10
inlineOnlyLambdas.kt:13
inlineOnlyLambdas.kt:16
inlineOnlyLambdas.kt:19
inlineOnlyLambdas.kt:22
Disconnected from the target VM
Process finished with exit code 0
idea/testData/debugger/tinyApp/src/stepping/custom/inlineOnlyLambdasStepping.kt
Vendored
-38
View File
@@ -1,38 +0,0 @@
package inlineOnlyLambdasStepping
class Test
fun test() {}
fun main(args: Array<String>) {
val data = Test()
// STEP_OVER: 2
//Breakpoint! (lambdaOrdinal = 1)
data.onelinerApply { test() }
data.multiLineApply { test() }
// STEP_OVER: 3
//Breakpoint! (lambdaOrdinal = 1)
data.onelinerApply2 { test() }
data.multiLineApply2 { test() }
}
@Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
@kotlin.internal.InlineOnly
inline fun <T> T.onelinerApply(block: T.() -> Unit): T { block(); return this }
@Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
@kotlin.internal.InlineOnly
inline fun <T> T.multiLineApply(block: T.() -> Unit): T {
block();
return this
}
inline fun <T> T.onelinerApply2(block: T.() -> Unit): T { block(); return this }
inline fun <T> T.multiLineApply2(block: T.() -> Unit): T {
block();
return this
}
idea/testData/debugger/tinyApp/src/stepping/custom/inlineOnlyLambdasStepping.out
Vendored
-13
View File
@@ -1,13 +0,0 @@
LineBreakpoint created at inlineOnlyLambdasStepping.kt:11 lambdaOrdinal = 1
LineBreakpoint created at inlineOnlyLambdasStepping.kt:17 lambdaOrdinal = 1
Run Java
Connected to the target VM
inlineOnlyLambdasStepping.kt:11
inlineOnlyLambdasStepping.kt:13
inlineOnlyLambdasStepping.kt:17
inlineOnlyLambdasStepping.kt:17
inlineOnlyLambdasStepping.kt:19
inlineOnlyLambdasStepping.kt:20
Disconnected from the target VM
Process finished with exit code 0
idea/testData/debugger/tinyApp/src/stepping/custom/smartStepIntoInlinedFunLiteral.out
Vendored
+1 -4
View File
@@ -6,10 +6,7 @@ smartStepIntoInlinedFunLiteral.kt:11
smartStepIntoInlinedFunLiteral.kt:12
smartStepIntoInlinedFunLiteral.kt:17
smartStepIntoInlinedFunLiteral.kt:18
smartStepIntoInlinedFunLiteral.kt:24
smartStepIntoInlinedFunLiteral.kt:26
smartStepIntoInlinedFunLiteral.kt:32
smartStepIntoInlinedFunLiteral.kt:32
smartStepIntoInlinedFunLiteral.kt:1
Disconnected from the target VM
Process finished with exit code 0
idea/testData/debugger/tinyApp/src/stepping/custom/smartStepIntoInlinedFunctionalExpression.out
Vendored
+1 -4
View File
@@ -6,10 +6,7 @@ smartStepIntoInlinedFunctionalExpression.kt:11
smartStepIntoInlinedFunctionalExpression.kt:12
smartStepIntoInlinedFunctionalExpression.kt:17
smartStepIntoInlinedFunctionalExpression.kt:18
smartStepIntoInlinedFunctionalExpression.kt:24
smartStepIntoInlinedFunctionalExpression.kt:26
smartStepIntoInlinedFunctionalExpression.kt:31
smartStepIntoInlinedFunctionalExpression.kt:31
smartStepIntoInlinedFunctionalExpression.kt:1
Disconnected from the target VM
Process finished with exit code 0
idea/testData/debugger/tinyApp/src/stepping/custom/stepOutInlineFunctionStdlib.out
Vendored
+2 -2
View File
@@ -2,8 +2,8 @@ LineBreakpoint created at stepOutInlineFunctionStdlib.kt:6
Run Java
Connected to the target VM
stepOutInlineFunctionStdlib.kt:6
_Collections.!EXT!
stepOutInlineFunctionStdlib.kt:9
stepOutInlineFunctionStdlib.kt:1
Thread.!EXT!
Disconnected from the target VM
Process finished with exit code 0
idea/testData/debugger/tinyApp/src/stepping/filters/stepIntoStdlib.out
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ LineBreakpoint created at stepIntoStdlib.kt:6
Run Java
Connected to the target VM
stepIntoStdlib.kt:6
_Arrays.!EXT!
ArraysKt.!EXT!
Disconnected from the target VM
Process finished with exit code 0
idea/testData/debugger/tinyApp/src/stepping/filters/stepIntoStdlibFacadeClass.out
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ LineBreakpoint created at stepIntoStdlibFacadeClass.kt:6
Run Java
Connected to the target VM
stepIntoStdlibFacadeClass.kt:6
_Arrays.!EXT!
ArraysKt.!EXT!
Iterables.!EXT!
Disconnected from the target VM
idea/testData/debugger/tinyApp/src/stepping/stepInto/inlineOnly.kt
Vendored
+1 -1
View File
@@ -27,5 +27,5 @@ inline fun forEach(s: () -> Unit) {
}
}
// STEP_INTO: 15
// STEP_INTO: 9
// TRACING_FILTERS_ENABLED: false
idea/testData/debugger/tinyApp/src/stepping/stepInto/inlineOnly.out
Vendored
+4 -10
View File
@@ -3,20 +3,14 @@ Run Java
Connected to the target VM
inlineOnly.kt:5
inlineOnly.kt:7
inlineOnly.kt:25
inlineOnly.kt:26
inlineOnly.kt:13
inlineOnly.kt:14
inlineOnly.kt:7
inlineOnly.kt:13
inlineOnly.kt:14
inlineOnly.kt:7
inlineOnly.kt:25
inlineOnly.kt:26
inlineOnly.kt:7
inlineOnly.kt:13
inlineOnly.kt:14
inlineOnly.kt:7
inlineOnly.kt:25
inlineOnly.kt:28
inlineOnly.kt:9
PrintStream.!EXT!
Disconnected from the target VM
Process finished with exit code 0
idea/testData/debugger/tinyApp/src/stepping/stepInto/stepIntoStdLibInlineFun.out
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ LineBreakpoint created at stepIntoStdLibInlineFun.kt:6
Run Java
Connected to the target VM
stepIntoStdLibInlineFun.kt:6
_Collections.!EXT!
stepIntoStdLibInlineFun.kt:1
resuming stepIntoStdLibInlineFun.kt:6
Disconnected from the target VM