-
Notifications
You must be signed in to change notification settings - Fork 393
Do not escape no-break space (\u00A0) #4267
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
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
a80c17c
Don't update loc files if there is no meaningful change
bekir-ozturk 76f6e27
Added test for unchanged loc files
bekir-ozturk 2501ce1
Don't escape no-break space.
bekir-ozturk 7ab9cc9
Test fixes
bekir-ozturk 038faba
Move collection comparison to a new method
bekir-ozturk 692c76c
Improve comments
bekir-ozturk 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
56 changes: 56 additions & 0 deletions
56
src/Microsoft.TemplateEngine.TemplateLocalizer.Core/ExtendedJavascriptEncoder.cs
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 |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
|
|
||
| using System; | ||
| using System.Buffers; | ||
| using System.Text; | ||
| using System.Text.Encodings.Web; | ||
|
|
||
| namespace Microsoft.TemplateEngine.TemplateLocalizer.Core | ||
| { | ||
| internal class ExtendedJavascriptEncoder : JavaScriptEncoder | ||
| { | ||
| public override int MaxOutputCharactersPerInputCharacter => UnsafeRelaxedJsonEscaping.MaxOutputCharactersPerInputCharacter; | ||
|
|
||
| public override unsafe int FindFirstCharacterToEncode(char* text, int textLength) | ||
| { | ||
| ReadOnlySpan<char> input = new ReadOnlySpan<char>(text, textLength); | ||
| int idx = 0; | ||
|
|
||
| while (Rune.DecodeFromUtf16(input.Slice(idx), out Rune result, out int charsConsumed) == OperationStatus.Done) | ||
| { | ||
| if (WillEncode(result.Value)) | ||
| { | ||
| // This character needs to be escaped. Break out. | ||
| break; | ||
| } | ||
| idx += charsConsumed; | ||
| } | ||
|
|
||
| if (idx == input.Length) | ||
| { | ||
| // None of the characters in the string needs to be escaped. | ||
| return -1; | ||
| } | ||
| return idx; | ||
| } | ||
|
|
||
| public override bool WillEncode(int unicodeScalar) | ||
| { | ||
| if (unicodeScalar == 0x00A0) | ||
| { | ||
| // Don't escape no-break space. | ||
| return false; | ||
| } | ||
| else | ||
| { | ||
| return UnsafeRelaxedJsonEscaping.WillEncode(unicodeScalar); | ||
| } | ||
| } | ||
|
|
||
| public override unsafe bool TryEncodeUnicodeScalar(int unicodeScalar, char* buffer, int bufferLength, out int numberOfCharactersWritten) | ||
| { | ||
| return UnsafeRelaxedJsonEscaping.TryEncodeUnicodeScalar(unicodeScalar, buffer, bufferLength, out numberOfCharactersWritten); | ||
| } | ||
| } | ||
| } |
28 changes: 23 additions & 5 deletions
28
src/Microsoft.TemplateEngine.TemplateLocalizer.Core/LocalizableStrings.Designer.cs
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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
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
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.