Skip to content

Compiler: Fix and improve performance of entity decoding #12182

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
DustinCampbell merged 8 commits into from
Sep 8, 2025
Merged

Compiler: Fix and improve performance of entity decoding #12182

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6f23ef0
Fix decoding hex HTML character entities and avoid allocations
DustinCampbell Sep 4, 2025
6aabf18
Use GetAlternateLookup() to avoid string allocation on .NET 9+
DustinCampbell Sep 4, 2025
076ad56
Don't use dictionary and string.Replace to build decoded text
DustinCampbell Sep 4, 2025
e266160
MemoryBuilder<ReadOnlyMemory<char>> helpers for creating strings
DustinCampbell Sep 4, 2025
519d43b
Improve ComponentMarkupEncodingPass.VisitHtml
DustinCampbell Sep 4, 2025
b0cad51
Clean up ComponentMarkupEncodingPass
DustinCampbell Sep 4, 2025
b14819d
Clean up ParserHelpers
DustinCampbell Sep 4, 2025
69295b7
Code review feedback for TryGetHtmlEntity
DustinCampbell Sep 8, 2025
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
19 changes: 19 additions & 0 deletions ...er/Microsoft.AspNetCore.Razor.Language/test/Components/ComponentMarkupEncodingPassTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,25 @@ public void Execute_MixedHtmlContent_MultipleHTMLEntities_DoesNotSetEncoded()
Assert.False(node.HasEncodedContent);
}

[Fact]
public void Execute_MixedHtmlContent_HexadecimalHTMLEntities_DoesNotSetEncoded()
{
// Arrange
var document = CreateDocument(@"
<div>Symbols &#x41;&#X42;&#x3D;&#X3d; @DateTime.Now</div>");
var expected = NormalizeContent("Symbols AB== ");

var documentNode = Lower(document);

// Act
Pass.Execute(document, documentNode);

// Assert
var node = documentNode.FindDescendantNodes<HtmlContentIntermediateNode>().Single();
Assert.Equal(expected, GetHtmlContent(node));
Assert.False(node.HasEncodedContent);
}

private string NormalizeContent(string content)
{
// Normalize newlines since we are testing lengths of things.
Expand Down
Loading