watch window enhancements

JaneySprings · May 30, 2024 · d70f562 · d70f562
1 parent 1108bc9
commit d70f562
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/src/DotNet.Meteor.Debug/DebugSession.cs b/src/DotNet.Meteor.Debug/DebugSession.cs
@@ -371,7 +371,7 @@ public class DebugSession : Session {
                 throw new ProtocolException($"command handled by {launchAgent}");
             }
 
-            var expression = arguments.Expression.TrimEnd(';');
+            var expression = arguments.TrimExpression();
             var frame = frameHandles.Get(arguments.FrameId ?? 0, null);
             if (frame == null)
                 throw new ProtocolException("no active stackframe");

diff --git a/src/DotNet.Meteor.Debug/Extensions/ServerExtensions.cs b/src/DotNet.Meteor.Debug/Extensions/ServerExtensions.cs
@@ -93,6 +93,9 @@ public static class ServerExtensions {
             return targetDirectory;
         }
     }
+    public static string TrimExpression(this DebugProtocol.EvaluateArguments args) {
+        return args.Expression?.TrimEnd(';')?.Replace("?.", ".");
+    }
 
     public static T DoSafe<T>(Func<T> handler, Action finalizer = null) {
         try {

diff --git a/src/Mono.Debugger b/src/Mono.Debugger