Merge pull request #43666 from NipunaRanasinghe/master

Fix debugger step-over behaviour followed by step-in instructions
ballerina-platform · Dec 4, 2024 · 333ec52 · 333ec52
2 parents ed07a3f + d417ec9
commit 333ec52
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/.../debug-adapter-core/src/main/java/org/ballerinalang/debugadapter/BreakpointProcessor.java b/.../debug-adapter-core/src/main/java/org/ballerinalang/debugadapter/BreakpointProcessor.java
@@ -268,7 +268,8 @@ void activateDynamicBreakPoints(int threadId, DynamicBreakpointMode mode, boolea
      */
     private boolean isWithinSameSource(Location currentLocation, Location prevLocation) {
         try {
-            return Objects.equals(currentLocation.sourcePath(), prevLocation.sourcePath());
+            return Objects.equals(currentLocation.sourcePath(), prevLocation.sourcePath())
+                    && Objects.equals(currentLocation.method().name(), prevLocation.method().name());
         } catch (AbsentInformationException e) {
             return false;
         }