Update breakpoint status change notifications to DAP way

JaneySprings · Feb 17, 2024 · a2032bd · a2032bd
1 parent 53faad6
commit a2032bd
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 11 deletions.
diff --git a/src/DotNet.Meteor.Debug/DebugSession.cs b/src/DotNet.Meteor.Debug/DebugSession.cs
@@ -37,6 +37,8 @@ public class DebugSession : Session {
         session.TargetExited += TargetExited;
         session.TargetThreadStarted += TargetThreadStarted;
         session.TargetThreadStopped += TargetThreadStopped;
+
+        session.Breakpoints.BreakpointStatusChanged += BreakpointStatusChanged;
     }
 
     protected override MonoClient.ICustomLogger GetLogger() => MonoClient.DebuggerLoggingService.CustomLogger;
@@ -196,9 +198,9 @@ public class DebugSession : Session {
                 breakpoint.TraceExpression = $"[LogPoint]: {breakpointInfo.LogMessage}";
             }
 
-            var verified = breakpoint.WaitForBound(session);
             breakpoints.Add(new DebugProtocol.Breakpoint() {
-                Verified = verified,
+                Id = breakpoint.GetHashCode(),
+                Verified = false, // updated by event
                 Line =  breakpoint.Line,
                 Column = breakpoint.Column
             });
@@ -502,6 +504,9 @@ public class DebugSession : Session {
         GetLogger().LogError($"[Handled] {ex.Message}", ex);
         return true;
     }
+    private void BreakpointStatusChanged(object sender, MonoClient.BreakpointEventArgs e) {
+        Protocol.SendEvent(new BreakpointEvent(BreakpointEvent.ReasonValue.Changed, e.Breakpoint.ToBreakpoint(session)));
+    }
     private void OnSessionLog(bool isError, string message) {
         if (isError) GetLogger().LogError($"[Error] {message.Trim()}", null);
         else GetLogger().LogMessage($"[Info] {message.Trim()}");

diff --git a/src/DotNet.Meteor.Debug/Extensions/MonoExtensions.cs b/src/DotNet.Meteor.Debug/Extensions/MonoExtensions.cs
@@ -53,11 +53,4 @@ public static class MonoExtensions {
         options.UseExternalTypeResolver = useExternalTypeResolver;
         return frame.GetExpressionValue(expression, options);
     }
-    public static bool WaitForBound(this BreakEvent breakEvent, SoftDebuggerSession session, int millisecondsTimeout = 150) {
-        return Task.Run(async() => {
-            while (breakEvent.GetStatus(session) == BreakEventStatus.NotBound)
-                await Task.Delay(millisecondsTimeout/3);
-            return breakEvent.GetStatus(session) == BreakEventStatus.Bound;
-        }).Wait(millisecondsTimeout);
-    }
 }
diff --git a/src/DotNet.Meteor.Debug/Extensions/ServerExtensions.cs b/src/DotNet.Meteor.Debug/Extensions/ServerExtensions.cs
@@ -5,11 +5,11 @@
 using System.Text.Json.Serialization.Metadata;
 using Newtonsoft.Json.Linq;
 using NewtonConverter = Newtonsoft.Json.JsonConvert;
-using DebugProtocol =  Microsoft.VisualStudio.Shared.VSCodeDebugProtocol.Messages;
+using DebugProtocol = Microsoft.VisualStudio.Shared.VSCodeDebugProtocol.Messages;
 using System.IO;
 using Microsoft.VisualStudio.Shared.VSCodeDebugProtocol;
 using DotNet.Meteor.Shared;
-using System.Collections.Generic;
+using Mono.Debugging.Soft;
 
 namespace DotNet.Meteor.Debug.Extensions;
 
@@ -85,4 +85,14 @@ public static class ServerExtensions {
 
         return DebugProtocol.CompletionItemType.Text;
     }
+
+    public static DebugProtocol.Breakpoint ToBreakpoint(this Breakpoint breakpoint, SoftDebuggerSession session) {
+        return new DebugProtocol.Breakpoint() {
+            Id = breakpoint.GetHashCode(),
+            Verified = breakpoint.GetStatus(session) == BreakEventStatus.Bound,
+            Message = breakpoint.GetStatusMessage(session),
+            Line = breakpoint.Line,
+            Column = breakpoint.Column,
+        };
+    }
 }