[release/7.0] [wasm][debugger] Don't escape accented letters (#78217)

* Don't need to escape special characters anymore * backporting 78320 * Fix characters * Removing unit tests. * remove unused code.
dotnet · Nov 15, 2022 · c38b76a · c38b76a
1 parent 404246b
commit c38b76a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/src/mono/wasm/debugger/BrowserDebugProxy/DebugStore.cs b/src/mono/wasm/debugger/BrowserDebugProxy/DebugStore.cs
@@ -1207,11 +1207,9 @@ private static string EscapeAscii(string path)
             {
                 switch (c)
                 {
-                    case var _ when c >= 'a' && c <= 'z':
-                    case var _ when c >= 'A' && c <= 'Z':
-                    case var _ when char.IsDigit(c):
+                    case var _ when char.IsLetterOrDigit(c):
                     case var _ when c > 255:
-                    case var _ when c == '+' || c == ':' || c == '.' || c == '-' || c == '_' || c == '~':
+                    case var _ when c == '+' || c == ':' || c == '.' || c == '-' || c == '_' || c == '~' || c == '´' || c == '`' || c == '^' || c == '¨':
                         builder.Append(c);
                         break;
                     case var _ when c == Path.DirectorySeparatorChar:
@@ -1220,13 +1218,14 @@ private static string EscapeAscii(string path)
                         builder.Append(c);
                         break;
                     default:
-                        builder.Append(string.Format($"%{((int)c):X2}"));
+                        builder.AppendFormat("%{0:X2}", (int)c);
                         break;
                 }
             }
             return builder.ToString();
         }
 
+
         internal void AddMethod(MethodInfo mi)
         {
             if (!this.methods.ContainsKey(mi.Token))

diff --git a/src/mono/wasm/debugger/DebuggerTestSuite/MiscTests.cs b/src/mono/wasm/debugger/DebuggerTestSuite/MiscTests.cs
@@ -964,7 +964,7 @@ await EvaluateAndCheck(
             "dotnet://debugger-test-special-char-in-path.dll/test#.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-ąłÅ.cs")]
         public async Task SetBreakpointInProjectWithSpecialCharactersInPath(
             string classWithNamespace, string expectedFileLocation)
         {

diff --git a/...cial-char-in-path-#@/non-ascii-test-ął.cs → ...ial-char-in-path-#@/non-ascii-test-ąłÅ.cs b/...cial-char-in-path-#@/non-ascii-test-ął.cs → ...ial-char-in-path-#@/non-ascii-test-ąłÅ.cs