Evaluate expression: fix exception for breakpoints on object header (for accessor methods)
This commit is contained in:
+1
-1
@@ -190,7 +190,7 @@ private fun addDebugExpressionBeforeContextElement(codeFragment: JetCodeFragment
|
|||||||
contextElement is JetProperty && !contextElement.isLocal() -> {
|
contextElement is JetProperty && !contextElement.isLocal() -> {
|
||||||
wrapInRunFun(contextElement.getDelegateExpressionOrInitializer()!!)
|
wrapInRunFun(contextElement.getDelegateExpressionOrInitializer()!!)
|
||||||
}
|
}
|
||||||
contextElement is JetClass -> {
|
contextElement is JetClassOrObject -> {
|
||||||
insertNewInitializer(contextElement.getBody())
|
insertNewInitializer(contextElement.getBody())
|
||||||
}
|
}
|
||||||
contextElement is JetClassObject -> {
|
contextElement is JetClassObject -> {
|
||||||
|
|||||||
@@ -0,0 +1,15 @@
|
|||||||
|
LineBreakpoint created at onObjectHeader.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 !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! onObjectHeader.OnObjectHeaderPackage
|
||||||
|
Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
|
||||||
|
onObjectHeader.kt:5
|
||||||
|
onObjectHeader.kt:10
|
||||||
|
onObjectHeader.kt:16
|
||||||
|
onObjectHeader.kt:8
|
||||||
|
onObjectHeader.kt:11
|
||||||
|
onObjectHeader.kt:20
|
||||||
|
onObjectHeader.kt:21
|
||||||
|
onObjectHeader.kt:8
|
||||||
|
Compile bytecode for 1 + 1
|
||||||
|
Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
|
||||||
|
|
||||||
|
Process finished with exit code 0
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
package onObjectHeader
|
||||||
|
|
||||||
|
fun main(args: Array<String>) {
|
||||||
|
//Breakpoint!
|
||||||
|
A.test()
|
||||||
|
}
|
||||||
|
|
||||||
|
object A {
|
||||||
|
fun test() {
|
||||||
|
lambda {
|
||||||
|
foo()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun lambda(f: () -> Unit) {
|
||||||
|
f()
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun foo() {
|
||||||
|
val a = 2
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// STEP_INTO: 7
|
||||||
|
|
||||||
|
// EXPRESSION: 1 + 1
|
||||||
|
// RESULT: 2: I
|
||||||
+6
@@ -160,6 +160,12 @@ public class KotlinEvaluateExpressionTestGenerated extends AbstractKotlinEvaluat
|
|||||||
doSingleBreakpointTest(fileName);
|
doSingleBreakpointTest(fileName);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@TestMetadata("onObjectHeader.kt")
|
||||||
|
public void testOnObjectHeader() throws Exception {
|
||||||
|
String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/onObjectHeader.kt");
|
||||||
|
doSingleBreakpointTest(fileName);
|
||||||
|
}
|
||||||
|
|
||||||
@TestMetadata("privateMember.kt")
|
@TestMetadata("privateMember.kt")
|
||||||
public void testPrivateMember() throws Exception {
|
public void testPrivateMember() throws Exception {
|
||||||
String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/privateMember.kt");
|
String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/privateMember.kt");
|
||||||
|
|||||||
Reference in New Issue
Block a user