- WDBG UX improvements

Author: oleg-shilo

src/out/static_content/-wdbg/dbg-inject.cs

@@ -258,7 +258,8 @@ public static (string script, string decoratedScript, int[] breakpoints)[] Proce
                             variablesToAnalyse = variablesToAnalyse.Except(invalidVariables[indexInErrorOutput]).ToList();
                     }
 
-                    var inspectionObjects = string.Join(", ", variablesToAnalyse.Select(x => $"(\"{x}\", {x})"));
+                    // var inspectionObjects = string.Join(", ", variablesToAnalyse.Select(x => $"(\"{x}\", {x})"));
+                    var inspectionObjects = string.Join(", ", variablesToAnalyse.Select(x => $"{x}.v()"));
 
                     if (scope.File == script && lines.Count() >= scope.StartLine)
                     {

src/out/static_content/-wdbg/dbg-runtime.cs

@@ -19,6 +19,11 @@
 
 public static class DBG
 {
+    public static (string, object) v(this object value, [CallerArgumentExpression("value")] string expr = null)
+    {
+        return (expr, value);
+    }
+
     static DBG()
     {
         if (Environment.GetEnvironmentVariable("CSS_WEB_DEBUGGING_URL") == null)
@@ -836,6 +841,10 @@ static public string ReplaceClrAliaces(this string text, bool hideSystemNamespac
 
         public static string ToReadable(this string methodName)
         {
+            if (methodName.Contains("<Main>")) // at runtime CLR decorates even normal mail (e.g. if it is async)
+                return "Main";
+
+            // classless main, local methods and lambdas
             var result = methodName?
                          .Replace("<", "")
                          .Replace(">", "")
@@ -863,14 +872,17 @@ public static string[] GetCallChain(this StackFrame[] frames)
 
                 if (method != null)
                 {
-                    var declaringType = method.DeclaringType?.Name ?? "UnknownType";
+                    var declaringType = method.DeclaringType?.FullName ?? "UnknownType";
 
                     // local methods and lambdas
                     //<<Main>$>g__setup_say_hello|0_0
                     //<<Main>$>g__test|0_1
                     //<Main>$
 
                     var methodName = method.Name?.ToReadable() ?? "UnknownMethod";
+                    if (method.ReflectedType.FullName?.Contains("+<Main>") == true)
+                        methodName = "Main";
+
                     var fileName = frame.GetFileName() ?? "";
                     var lineNumber = frame.GetFileLineNumber();
 

src/out/static_content/-wdbg/dbg-server/Pages/CodeMirrorPage.razor

@@ -510,6 +510,7 @@
     async Task<string> GetUndoBuffer() { try{ return await js<string>("codemirrorInterop.getUndoBuffer");} catch (Exception e) { e.Log(); } return ""; }
     async Task SetUndoBuffer(string buffer) { try{ await js("codemirrorInterop.setUndoBuffer", buffer);} catch (Exception e) { e.Log(); } }
     async Task FocusEditor() { try { await js("codemirrorInterop.focusEditor"); } catch (Exception e) { e.Log(); } }
+    async Task BrowserLog(string message) { try { await js("codemirrorInterop.log", message); } catch (Exception e) { e.Log(); } }
 
     async Task OnThemeChanged(ChangeEventArgs e)
     {

src/out/static_content/-wdbg/dbg-server/Pages/CodeMirrorPage.razor.cs

@@ -1,13 +1,13 @@
-using Microsoft.AspNetCore.Components;
-using Microsoft.AspNetCore.Components.Forms;
-using Microsoft.AspNetCore.Components.Web;
-using Microsoft.JSInterop;
-using System;
+using System;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text.Json;
+using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.Forms;
+using Microsoft.AspNetCore.Components.Web;
+using Microsoft.JSInterop;
 using wdbg.cs_script;
 
 namespace wdbg.Pages;
@@ -330,6 +330,7 @@ public async Task OpenScriptFolder()
         }
         catch (Exception e) { e.Log(); }
     }
+
     public async Task OpenScriptDebugFolder()
     {
         try
@@ -545,6 +546,8 @@ public async Task StartGeneratingDebugMetadata(bool showNotification)
                     {
                         var error = e.Message ?? "Generating debug information for the loaded script has failed.";
 
+                        _ = BrowserLog(error);
+
                         if (e.Message?.Contains("Error: Specified file could not be compiled.") == true)
                         {
                             Editor.DebugGenerationError =
@@ -553,7 +556,12 @@ public async Task StartGeneratingDebugMetadata(bool showNotification)
                         }
 
                         if (showNotification)
+                        {
+                            if (error.Length > 400)
+                                error = error.Substring(0, 400) + "... (error text is truncated, see browser console log for the complete error text)";
                             Editor.ShowToastError(error); // failures can happen (e.g. *.dbg.cs is still locked)
+                        }
+
 
                         Editor.ResetDbgGenerator();
                         Editor.LoadedScriptDbg = null;

src/out/static_content/-wdbg/dbg-server/wwwroot/codemirrorInterop.js

@@ -1228,4 +1228,8 @@ window.codemirrorInterop.triggerCompletion = function () {
         return true;
     }
     return false;
+};
+
+window.codemirrorInterop.log = function (message) {
+    console.log(message);
 };