-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Fix for WebView.EvaluateJavaScriptAsync fails to execute JavaScript containing newline characters #29126
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.
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
Open
praveenkumarkarunanithi
wants to merge
8
commits into
dotnet:main
Choose a base branch
from
praveenkumarkarunanithi:fix-11905
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+92
−2
Open
Fix for WebView.EvaluateJavaScriptAsync fails to execute JavaScript containing newline characters #29126
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
238e837
added UI test
praveenkumarkarunanithi 879bea9
Update Issue11905.cs
praveenkumarkarunanithi 2adcc7b
updated unit test
praveenkumarkarunanithi bfc52b2
updated fix including changes on PR-27528
praveenkumarkarunanithi 5efa6b8
Revert "Resolved branch conflict"
praveenkumarkarunanithi 577c243
fix updated.
praveenkumarkarunanithi 5257a56
incorporated valid copilot suggestion
praveenkumarkarunanithi 175686c
Merge branch 'dotnet:main' into fix-11905
praveenkumarkarunanithi File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,10 +5,54 @@ | |
|
|
||
| internal static partial class WebViewHelper | ||
| { | ||
| const string NewlineMarker = "##NL##"; | ||
|
|
||
| internal static string? EscapeJsString(string js) | ||
| { | ||
| if (js == null) | ||
| return null; | ||
| if (string.IsNullOrEmpty(js)) | ||
| return js; | ||
|
|
||
| // Normalize line endings | ||
| js = Regex.Replace(js, @"\r\n|\r", "\n"); | ||
|
|
||
| #if NET6_0_OR_GREATER || NETSTANDARD2_1_OR_GREATER | ||
| bool hasBacktick = js.Contains('`', StringComparison.Ordinal); | ||
| #else | ||
| bool hasBacktick = js.IndexOf('`') != -1; | ||
| #endif | ||
|
|
||
| // Escape sequence marker | ||
| #if NET6_0_OR_GREATER || NETSTANDARD2_1_OR_GREATER | ||
| js = js.Replace("\\n", NewlineMarker, StringComparison.Ordinal); | ||
| #else | ||
| js = js.Replace("\\n", NewlineMarker); | ||
| #endif | ||
| // Escape backticks if present | ||
| if (hasBacktick) | ||
| { | ||
| #if NET6_0_OR_GREATER || NETSTANDARD2_1_OR_GREATER | ||
| js = js.Replace("`", "\\`", StringComparison.Ordinal); | ||
| #else | ||
| js = js.Replace("`", "\\`"); | ||
| #endif | ||
| } | ||
|
|
||
| // Remove backslash-newline continuation | ||
| js = Regex.Replace(js, @"\\[ \t]*\n", string.Empty); | ||
|
||
|
|
||
| // Replace literal newlines with \n | ||
| #if NET6_0_OR_GREATER || NETSTANDARD2_1_OR_GREATER | ||
| js = js.Replace("\n", "\\n", StringComparison.Ordinal); | ||
| #else | ||
| js = js.Replace("\n", "\\n"); | ||
| #endif | ||
|
|
||
| // Restore original escape sequences | ||
| #if NET6_0_OR_GREATER || NETSTANDARD2_1_OR_GREATER | ||
| js = js.Replace(NewlineMarker, "\\\\n", StringComparison.Ordinal); | ||
| #else | ||
| js = js.Replace(NewlineMarker, "\\\\n"); | ||
| #endif | ||
|
|
||
| #if NET6_0_OR_GREATER || NETSTANDARD2_1_OR_GREATER | ||
| if (!js.Contains('\'', StringComparison.Ordinal)) | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.