[wasm][debugger] Revert don't need to escape special characters anymore

src/mono/wasm/debugger/BrowserDebugProxy/DebugStore.cs

@@ -1183,11 +1183,13 @@ internal SourceFile(AssemblyInfo assembly, int id, DocumentHandle docHandle, Uri
             this.doc = assembly.pdbMetadataReader.GetDocument(docHandle);
             this.docHandle = docHandle;
             this.url = url;
-            this.DebuggerFileName = url.Replace("\\", "/").Replace(":", "");
+
+            this.DebuggerFileName = EscapeAscii(url);
             this.BreakableLines = new List<int>();
 
-            this.SourceUri = new Uri((Path.IsPathRooted(url) ? "file://" : "") + url, UriKind.RelativeOrAbsolute);
-            if (SourceUri.IsFile && File.Exists(SourceUri.LocalPath))
+
+            this.SourceUri = new Uri((Path.IsPathRooted(url) ? "file://" : "") + DebuggerFileName, UriKind.RelativeOrAbsolute);
+            if (SourceUri.IsFile && File.Exists(url))
             {
                 this.Url = this.SourceUri.ToString();
             }
@@ -1197,6 +1199,21 @@ internal SourceFile(AssemblyInfo assembly, int id, DocumentHandle docHandle, Uri
             }
         }
 
+        private static string EscapeAscii(string path)
+        {
+            var builder = new StringBuilder();
+            foreach (var part in Regex.Split(path, @"([:\\/])"))
+            {
+                if (part == ":")
+                    builder.Append(part);
+                else if (part == "\\" || part == "/")
+                    builder.Append('/');
+                else
+                    builder.Append(Uri.EscapeDataString(part));
+            }
+            return builder.ToString();
+        }
+
         internal void AddMethod(MethodInfo mi)
         {
             if (!this.methods.ContainsKey(mi.Token))

src/mono/wasm/debugger/DebuggerTestSuite/MiscTests.cs

@@ -961,20 +961,24 @@ await EvaluateAndCheck(
         [Theory]
         [InlineData(
             "DebuggerTests.CheckSpecialCharactersInPath",
-            "dotnet://debugger-test-special-char-in-path.dll/test#.cs")]
+            "dotnet://debugger-test-special-char-in-path.dll/test%23.cs",
+            "debugger-test-special-char-in-path-%23%40/test%23.cs")]
         [InlineData(
             "DebuggerTests.CheckSNonAsciiCharactersInPath",
-            "dotnet://debugger-test-special-char-in-path.dll/non-ascii-test-ął.cs")]
+            "dotnet://debugger-test-special-char-in-path.dll/non-ascii-test-%C4%85%C5%82%C3%85.cs",
+            "debugger-test-special-char-in-path-%23%40/non-ascii-test-ąłÅ.cs")]
         public async Task SetBreakpointInProjectWithSpecialCharactersInPath(
-            string classWithNamespace, string expectedFileLocation)
+            string classWithNamespace, string expectedFileLocation, string expectedFileNameEscaped)
         {
             var bp = await SetBreakpointInMethod("debugger-test-special-char-in-path.dll", classWithNamespace, "Evaluate", 1);
-            await EvaluateAndCheck(
+            var ret = await EvaluateAndCheck(
                 $"window.setTimeout(function() {{ invoke_static_method ('[debugger-test-special-char-in-path] {classWithNamespace}:Evaluate'); }}, 1);",
                 expectedFileLocation,
                 bp.Value["locations"][0]["lineNumber"].Value<int>(),
                 bp.Value["locations"][0]["columnNumber"].Value<int>(),
                 $"{classWithNamespace}.Evaluate");
+            Console.WriteLine("olha thays - " + ret["callFrames"][0]["url"].Value<string>());
+            Assert.EndsWith(expectedFileNameEscaped, ret["callFrames"][0]["url"].Value<string>(), StringComparison.InvariantCulture);
         }
 
         [Theory]
@@ -1097,12 +1101,13 @@ await EvaluateAndCheck(
         public async Task SetBreakpointInProjectWithChineseCharactereInPath()
         {
             var bp = await SetBreakpointInMethod("debugger-test-chinese-char-in-path-ㄨ.dll", "DebuggerTests.CheckChineseCharacterInPath", "Evaluate", 1);
-            await EvaluateAndCheck(
+            var ret = await EvaluateAndCheck(
                 $"window.setTimeout(function() {{ invoke_static_method ('[debugger-test-chinese-char-in-path-ㄨ] DebuggerTests.CheckChineseCharacterInPath:Evaluate'); }}, 1);",
                 "dotnet://debugger-test-chinese-char-in-path-ㄨ.dll/test.cs",
                 bp.Value["locations"][0]["lineNumber"].Value<int>(),
                 bp.Value["locations"][0]["columnNumber"].Value<int>(),
                 $"DebuggerTests.CheckChineseCharacterInPath.Evaluate");
+            Assert.EndsWith("debugger-test-chinese-char-in-path-ㄨ/test.cs", ret["callFrames"][0]["url"].Value<string>(), StringComparison.InvariantCulture);
         }
 
         [Fact]