Fix step filter: keep method exit request (microsoft#387)

adpi2 · web-flow · commit a5b88da1ec7a · 2021-10-12T15:20:31.000+08:00
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/StepRequestHandler.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/StepRequestHandler.java
@@ -145,20 +145,22 @@ public CompletableFuture<Response> handle(Command command, Arguments arguments,
     private void handleDebugEvent(DebugEvent debugEvent, IDebugSession debugSession, IDebugAdapterContext context,
             ThreadState threadState) {
         Event event = debugEvent.event;
+        EventRequestManager eventRequestManager = debugSession.getVM().eventRequestManager();
 
         // When a breakpoint occurs, abort any pending step requests from the same thread.
         if (event instanceof BreakpointEvent || event instanceof ExceptionEvent) {
             long threadId = ((LocatableEvent) event).thread().uniqueID();
             if (threadId == threadState.threadId && threadState.pendingStepRequest != null) {
-                threadState.deleteStepRequests(debugSession.getVM().eventRequestManager());
+                threadState.deleteStepRequest(eventRequestManager);
+                threadState.deleteMethodExitRequest(eventRequestManager);
                 context.getStepResultManager().removeMethodResult(threadId);
                 if (threadState.eventSubscription != null) {
                     threadState.eventSubscription.dispose();
                 }
             }
         } else if (event instanceof StepEvent) {
             ThreadReference thread = ((StepEvent) event).thread();
-            threadState.deleteStepRequests(debugSession.getVM().eventRequestManager());
+            threadState.deleteStepRequest(eventRequestManager);
             if (isStepFiltersConfigured(context.getStepFilters())) {
                 try {
                     if (threadState.pendingStepType == Command.STEPIN) {
@@ -181,6 +183,7 @@ private void handleDebugEvent(DebugEvent debugEvent, IDebugSession debugSession,
                     // ignore.
                 }
             }
+            threadState.deleteMethodExitRequest(eventRequestManager);
             if (threadState.eventSubscription != null) {
                 threadState.eventSubscription.dispose();
             }
@@ -280,10 +283,13 @@ class ThreadState {
         Location stepLocation = null;
         Disposable eventSubscription = null;
 
-        public void deleteStepRequests(EventRequestManager manager) {
-            DebugUtility.deleteEventRequestSafely(manager, this.pendingStepRequest);
+        public void deleteMethodExitRequest(EventRequestManager manager) {
             DebugUtility.deleteEventRequestSafely(manager, this.pendingMethodExitRequest);
             this.pendingMethodExitRequest = null;
+        }
+
+        public void deleteStepRequest(EventRequestManager manager) {
+            DebugUtility.deleteEventRequestSafely(manager, this.pendingStepRequest);
             this.pendingStepRequest = null;
         }
     }
