Reorder step filter logic

adpi2 · adpi2 · commit 4d19fec97777 · 2022-10-03T11:38:39.000+02:00
diff --git a/com.microsoft.java.debug.core/pom.xml b/com.microsoft.java.debug.core/pom.xml
@@ -8,7 +8,7 @@
     <name>${base.name} :: Debugger Core</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/scalacenter/java-debug</url>
-    <version>0.34.0+5</version>
+    <version>0.34.0+6</version>
     <properties>
         <base.name>Java Debug Server for Visual Studio Code</base.name>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/IStepFilterProvider.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/IStepFilterProvider.java
@@ -18,5 +18,5 @@
 public interface IStepFilterProvider extends IProvider {
     boolean shouldStepInto(Method method, Requests.StepFilters filters);
 
-    boolean shouldStepOut(Location previousLocation, Method method);
+    boolean shouldStepOut(Location upperLocation, Method method);
 }
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
@@ -164,13 +164,18 @@ private void handleDebugEvent(DebugEvent debugEvent, IDebugSession debugSession,
             try {
                 Location originalLocation = threadState.stepLocation;
                 Location currentLocation = getTopFrame(thread).location();
-                Location previousLocation = null;
+                Location upperLocation = null;
                 if (thread.frameCount() > 1) {
-                    previousLocation = thread.frame(1).location();
+                    upperLocation = thread.frame(1).location();
                 }
                 if (originalLocation != null && currentLocation != null) {
                     boolean steppingIn = threadState.pendingStepType == Command.STEPIN;
                     Requests.StepFilters stepFilters = context.getStepFilters();
+                    // If we stepped into a method that should be stepped out
+                    if (shouldStepOut(stepFilter, threadState.stackDepth, thread.frameCount(), upperLocation, currentLocation)) {
+                        doExtraStepOut(debugEvent, thread, stepFilters, threadState);
+                        return;
+                    }
                     // If the ending location is the same as the original location do another step into.
                     if (steppingIn && shouldDoExtraStep(threadState.stackDepth, originalLocation, thread.frameCount(), currentLocation)) {
                         doExtraStepInto(debugEvent, thread, stepFilters, threadState);
@@ -181,11 +186,6 @@ private void handleDebugEvent(DebugEvent debugEvent, IDebugSession debugSession,
                         doExtraStepInto(debugEvent, thread, stepFilters, threadState);
                         return;
                     }
-                    // If we stepped into a method that should be stepped out
-                    if (steppingIn && stepFilter.shouldStepOut(previousLocation, currentLocation.method())) {
-                        doExtraStepOut(debugEvent, thread, stepFilters, threadState);
-                        return;
-                    }
                 }
 
             } catch (IncompatibleThreadStateException | IndexOutOfBoundsException ex) {
@@ -225,6 +225,12 @@ private boolean shouldStepInto(IStepFilterProvider stepFilter, Location original
                 && stepFilter.shouldStepInto(currentLocation.method(), stepFilters);
     }
 
+    private boolean shouldStepOut(IStepFilterProvider stepFilter, int originalStackDepth, int currentStackDepth, Location upperLocation,
+                                  Location currentLocation)
+            throws IncompatibleThreadStateException {
+        return currentStackDepth > originalStackDepth && stepFilter.shouldStepOut(upperLocation, currentLocation.method());
+    }
+
     /**
      * Check if the current top stack is same as the original top stack.
      *
diff --git a/com.microsoft.java.debug.plugin/META-INF/MANIFEST.MF b/com.microsoft.java.debug.plugin/META-INF/MANIFEST.MF
@@ -25,4 +25,4 @@ Bundle-ClassPath: lib/commons-io-2.10.0.jar,
  .,
  lib/rxjava-2.1.1.jar,
  lib/reactive-streams-1.0.0.jar,
- lib/com-microsoft-java-debug-core-0.34.0+5.jar
+ lib/com-microsoft-java-debug-core-0.34.0+6.jar
diff --git a/com.microsoft.java.debug.plugin/pom.xml b/com.microsoft.java.debug.plugin/pom.xml
@@ -45,7 +45,7 @@
                         <artifactItem>
                             <groupId>ch.epfl.scala</groupId>
                             <artifactId>com-microsoft-java-debug-core</artifactId>
-                            <version>0.34.0+5</version>
+                            <version>0.34.0+6</version>
                         </artifactItem>
                     </artifactItems>
                 </configuration>

Original file line number	Diff line number	Diff line change
`@@ -18,5 +18,5 @@`
`18`	`18`	`public interface IStepFilterProvider extends IProvider {`
`19`	`19`	`boolean shouldStepInto(Method method, Requests.StepFilters filters);`
`20`	`20`
`21`		`- boolean shouldStepOut(Location previousLocation, Method method);`
	`21`	`+ boolean shouldStepOut(Location upperLocation, Method method);`
`22`	`22`	`}`