Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thaystg merged 15 commits into from
Dec 8, 2022
Merged

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
df87f8a
Trying to fix again
thaystg Nov 14, 2022
d376fbd
Removing comment
thaystg Nov 14, 2022
ad9d8a7
trying to fix CI
thaystg Nov 14, 2022
5a1f99a
implementing escaped string for dotnet:// as discussed with @radical
thaystg Nov 14, 2022
a6b3574
addressing radical suggestion
thaystg Nov 16, 2022
8670d54
fix CI
thaystg Nov 18, 2022
3a54221
implementing test with colon as discussed with @radical.
thaystg Nov 18, 2022
736c206
fix on windows
thaystg Nov 18, 2022
49e5dad
pushing @radical changes and addressing @radical comments
thaystg Nov 24, 2022
eef46fd
using ilona suggestion about conditionalfact
thaystg Nov 24, 2022
b96d98a
Merge branch 'main' into thays_fix_78171
thaystg Nov 24, 2022
da864dd
Reverting one suggestion.
thaystg Nov 24, 2022
bb40b76
Fixing behavior on mac
thaystg Nov 24, 2022
5680344
Merge remote-tracking branch 'upstream/main' into thays_fix_78171
thaystg Dec 7, 2022
7c9429d
Merge branch 'thays_fix_78171' of github.com:thaystg/runtime into tha…
thaystg Dec 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
implementing escaped string for dotnet:// as discussed with @radical
  • Loading branch information
@thaystg
thaystg committed Nov 14, 2022
commit 5a1f99a08cfdbbf8ab0e37d7332c0aa63481ba17
5 changes: 3 additions & 2 deletions src/mono/wasm/debugger/BrowserDebugProxy/DebugStore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1183,10 +1183,11 @@ 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(":", "");
var urlWithSpecialCharCodedHex = EscapeAscii(url);
this.DebuggerFileName = urlWithSpecialCharCodedHex.Replace("\\", "/").Replace(":", "");
this.BreakableLines = new List<int>();

var urlWithSpecialCharCodedHex = EscapeAscii(url);

this.SourceUri = new Uri((Path.IsPathRooted(url) ? "file://" : "") + urlWithSpecialCharCodedHex, UriKind.RelativeOrAbsolute);
if (SourceUri.IsFile && File.Exists(SourceUri.LocalPath))
{
Expand Down
4 changes: 1 addition & 3 deletions src/mono/wasm/debugger/DebuggerTestSuite/MiscTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
using System.Threading.Tasks;
using Newtonsoft.Json.Linq;
using Xunit;
using Xunit.Sdk;
using Xunit.Abstractions;

[assembly: CollectionBehavior(CollectionBehavior.CollectionPerAssembly)]
Expand Down Expand Up @@ -962,7 +961,7 @@ 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",
Expand All @@ -972,7 +971,6 @@ public async Task SetBreakpointInProjectWithSpecialCharactersInPath(
string classWithNamespace, string expectedFileLocation, string expectedFileNameEscaped)
{
var bp = await SetBreakpointInMethod("debugger-test-special-char-in-path.dll", classWithNamespace, "Evaluate", 1);
var loc = bp.Value["locations"]?.Value<JArray>()[0];
var ret = await EvaluateAndCheck(
$"window.setTimeout(function() {{ invoke_static_method ('[debugger-test-special-char-in-path] {classWithNamespace}:Evaluate'); }}, 1);",
expectedFileLocation,
Expand Down