From 8ad18df3fa7bb91869d552e0e9d2fc0635151280 Mon Sep 17 00:00:00 2001
From: Natalia Ukhorskaya <natalia.ukhorskaya@jetbrains.com>
Date: Tue, 23 Sep 2014 12:52:56 +0400
Subject: [PATCH] Evaluate expression: switch off breakpoints during eval4j run

---
 .../debugger/evaluate/KotlinEvaluationBuilder.kt   |  5 +++++
 .../debugger/tinyApp/outs/methodWithBreakpoint.out |  9 +++++++++
 .../singleBreakpoint/methodWithBreakpoint.kt       | 14 ++++++++++++++
 .../KotlinEvaluateExpressionTestGenerated.java     |  6 ++++++
 4 files changed, 34 insertions(+)
 create mode 100644 idea/testData/debugger/tinyApp/outs/methodWithBreakpoint.out
 create mode 100644 idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/methodWithBreakpoint.kt

diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluationBuilder.kt b/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluationBuilder.kt
index 5e512c02a2a..da08c7233fb 100644
--- a/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluationBuilder.kt
+++ b/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluationBuilder.kt
@@ -161,6 +161,9 @@ class KotlinEvaluator(val codeFragment: JetCodeFragment,
                         val args = context.getArgumentsForEval4j(compiledData.parameters.getParameterNames(), Type.getArgumentTypes(desc))
                         return object : MethodNode(Opcodes.ASM5, access, name, desc, signature, exceptions) {
                             override fun visitEnd() {
+                                val breakpoints = virtualMachine.eventRequestManager().breakpointRequests()
+                                breakpoints?.forEach { it.disable() }
+
                                 resultValue = interpreterLoop(
                                         this,
                                         makeInitialFrame(this, args),
@@ -169,6 +172,8 @@ class KotlinEvaluator(val codeFragment: JetCodeFragment,
                                                 context.getSuspendContext().getThread()?.getThreadReference()!!,
                                                 context.getSuspendContext().getInvokePolicy())
                                 )
+
+                                breakpoints?.forEach { it.enable() }
                             }
                         }
                     }
diff --git a/idea/testData/debugger/tinyApp/outs/methodWithBreakpoint.out b/idea/testData/debugger/tinyApp/outs/methodWithBreakpoint.out
new file mode 100644
index 00000000000..26780684eb5
--- /dev/null
+++ b/idea/testData/debugger/tinyApp/outs/methodWithBreakpoint.out
@@ -0,0 +1,9 @@
+LineBreakpoint created at methodWithBreakpoint.kt:5
+LineBreakpoint created at methodWithBreakpoint.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 !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! methodWithBreakpoint.MethodWithBreakpointPackage
+Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+methodWithBreakpoint.kt:4
+Compile bytecode for foo()
+Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+
+Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/methodWithBreakpoint.kt b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/methodWithBreakpoint.kt
new file mode 100644
index 00000000000..4c31d33114b
--- /dev/null
+++ b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/methodWithBreakpoint.kt
@@ -0,0 +1,14 @@
+package methodWithBreakpoint
+
+fun main(args: Array<String>) {
+    //Breakpoint!
+    args.size
+}
+
+fun foo(): Int {
+    //Breakpoint!
+    return 1
+}
+
+// EXPRESSION: foo()
+// RESULT: 1: I
diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluateExpressionTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluateExpressionTestGenerated.java
index b9d3735e23f..a566793c0a0 100644
--- a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluateExpressionTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluateExpressionTestGenerated.java
@@ -144,6 +144,12 @@ public class KotlinEvaluateExpressionTestGenerated extends AbstractKotlinEvaluat
             doSingleBreakpointTest(fileName);
         }
         
+        @TestMetadata("methodWithBreakpoint.kt")
+        public void testMethodWithBreakpoint() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/methodWithBreakpoint.kt");
+            doSingleBreakpointTest(fileName);
+        }
+        
         @TestMetadata("multilineExpressionAtBreakpoint.kt")
         public void testMultilineExpressionAtBreakpoint() throws Exception {
             String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/multilineExpressionAtBreakpoint.kt");