Support set exception breakpoint asynchronously & bump veriosn to 0.4…

…5.0 (#482) * Support set exception breakpoint asynchronously & bump veriosn to 0.45.0
microsoft · Apr 24, 2023 · 87fae71 · 87fae71
1 parent 9df6f5d
commit 87fae71
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 11 deletions.
diff --git a/com.microsoft.java.debug.core/pom.xml b/com.microsoft.java.debug.core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.microsoft.java</groupId>
         <artifactId>java-debug-parent</artifactId>
-        <version>0.44.0</version>
+        <version>0.45.0</version>
     </parent>
     <artifactId>com.microsoft.java.debug.core</artifactId>
     <packaging>jar</packaging>

diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/DebugSession.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/DebugSession.java
@@ -226,6 +226,18 @@ public void setExceptionBreakpoints(boolean notifyCaught, boolean notifyUncaught
         }
     }
 
+    @Override
+    public void setExceptionBreakpoints(boolean notifyCaught, boolean notifyUncaught, String[] exceptionTypes,
+            String[] classFilters, String[] classExclusionFilters, boolean async) {
+        if (async) {
+            AsyncJdwpUtils.runAsync(() -> {
+                setExceptionBreakpoints(notifyCaught, notifyUncaught, exceptionTypes, classFilters, classExclusionFilters);
+            });
+        } else {
+            setExceptionBreakpoints(notifyCaught, notifyUncaught, exceptionTypes, classFilters, classExclusionFilters);
+        }
+    }
+
     @Override
     public Process process() {
         return vm.process();

diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/IDebugSession.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/IDebugSession.java
@@ -40,6 +40,9 @@ public interface IDebugSession {
 
     void setExceptionBreakpoints(boolean notifyCaught, boolean notifyUncaught, String[] exceptionTypes, String[] classFilters, String[] classExclusionFilters);
 
+    void setExceptionBreakpoints(boolean notifyCaught, boolean notifyUncaught, String[] exceptionTypes, String[] classFilters, String[] classExclusionFilters,
+        boolean async);
+
     IMethodBreakpoint createFunctionBreakpoint(String className, String functionName, String condition, int hitCount);
 
     Process process();

diff --git a/.../com/microsoft/java/debug/core/adapter/handler/SetExceptionBreakpointsRequestHandler.java b/.../com/microsoft/java/debug/core/adapter/handler/SetExceptionBreakpointsRequestHandler.java
@@ -38,6 +38,7 @@ public class SetExceptionBreakpointsRequestHandler implements IDebugRequestHandl
     private boolean isInitialized = false;
     private boolean notifyCaught = false;
     private boolean notifyUncaught = false;
+    private boolean asyncJDWP = false;
 
     @Override
     public List<Command> getTargetCommands() {
@@ -53,6 +54,7 @@ public synchronized CompletableFuture<Response> handle(Command command, Argument
         if (!isInitialized) {
             isInitialized = true;
             debugSession = context.getDebugSession();
+            asyncJDWP = context.asyncJDWP();
             DebugSettings.addDebugSettingChangeListener(this);
             debugSession.getEventHub().events().subscribe(debugEvent -> {
                 if (debugEvent.event instanceof VMDeathEvent
@@ -81,7 +83,7 @@ private void setExceptionBreakpoints(IDebugSession debugSession, boolean notifyC
         String[] exceptionTypes = (exceptionFilters == null ? null : exceptionFilters.exceptionTypes);
         String[] classFilters = (exceptionFilters == null ? null : exceptionFilters.allowClasses);
         String[] classExclusionFilters = (exceptionFilters == null ? null : exceptionFilters.skipClasses);
-        debugSession.setExceptionBreakpoints(notifyCaught, notifyUncaught, exceptionTypes, classFilters, classExclusionFilters);
+        debugSession.setExceptionBreakpoints(notifyCaught, notifyUncaught, exceptionTypes, classFilters, classExclusionFilters, this.asyncJDWP);
     }
 
     @Override

diff --git a/com.microsoft.java.debug.plugin/.classpath b/com.microsoft.java.debug.plugin/.classpath
@@ -11,6 +11,6 @@
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry exported="true" kind="lib" path="lib/rxjava-2.2.21.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/reactive-streams-1.0.4.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/com.microsoft.java.debug.core-0.44.0.jar" sourcepath="/com.microsoft.java.debug.core"/>
+	<classpathentry exported="true" kind="lib" path="lib/com.microsoft.java.debug.core-0.45.0.jar" sourcepath="/com.microsoft.java.debug.core"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/com.microsoft.java.debug.plugin/META-INF/MANIFEST.MF b/com.microsoft.java.debug.plugin/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Java Debug Server Plugin
 Bundle-SymbolicName: com.microsoft.java.debug.plugin;singleton:=true
-Bundle-Version: 0.44.0
+Bundle-Version: 0.45.0
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: com.microsoft.java.debug.plugin.internal.JavaDebuggerServerPlugin
@@ -25,4 +25,4 @@ Bundle-ClassPath: lib/commons-io-2.11.0.jar,
  .,
  lib/rxjava-2.2.21.jar,
  lib/reactive-streams-1.0.4.jar,
- lib/com.microsoft.java.debug.core-0.44.0.jar
+ lib/com.microsoft.java.debug.core-0.45.0.jar
diff --git a/com.microsoft.java.debug.plugin/pom.xml b/com.microsoft.java.debug.plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.microsoft.java</groupId>
         <artifactId>java-debug-parent</artifactId>
-        <version>0.44.0</version>
+        <version>0.45.0</version>
     </parent>
     <artifactId>com.microsoft.java.debug.plugin</artifactId>
     <packaging>eclipse-plugin</packaging>
@@ -56,7 +56,7 @@
                         <artifactItem>
                             <groupId>com.microsoft.java</groupId>
                             <artifactId>com.microsoft.java.debug.core</artifactId>
-                            <version>0.44.0</version>
+                            <version>0.45.0</version>
                         </artifactItem>
                     </artifactItems>
                 </configuration>

diff --git a/com.microsoft.java.debug.repository/category.xml b/com.microsoft.java.debug.repository/category.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <bundle id="com.microsoft.java.debug.plugin" version="0.44.0">
+   <bundle id="com.microsoft.java.debug.plugin" version="0.45.0">
    <category name="javadebug" />
    </bundle>
    <category-def name="javadebug" label="Java Debug Server"/>

diff --git a/com.microsoft.java.debug.repository/pom.xml b/com.microsoft.java.debug.repository/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.microsoft.java</groupId>
         <artifactId>java-debug-parent</artifactId>
-        <version>0.44.0</version>
+        <version>0.45.0</version>
     </parent>
 	<artifactId>com.microsoft.java.debug.repository</artifactId>
 	<packaging>eclipse-repository</packaging>

diff --git a/com.microsoft.java.debug.target/pom.xml b/com.microsoft.java.debug.target/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.microsoft.java</groupId>
 		<artifactId>java-debug-parent</artifactId>
-		<version>0.44.0</version>
+		<version>0.45.0</version>
 	</parent>
 	<artifactId>com.microsoft.java.debug.tp</artifactId>
 	<name>${base.name} :: Target Platform</name>

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <name>${base.name} :: Parent</name>
     <description>The Java Debug Server is an implementation of Visual Studio Code (VSCode) Debug Protocol. It can be used in Visual Studio Code to debug Java programs.</description>
     <url>https://github.com/Microsoft/java-debug</url>
-    <version>0.44.0</version>
+    <version>0.45.0</version>
     <packaging>pom</packaging>
     <properties>
         <base.name>Java Debug Server for Visual Studio Code</base.name>