Compiler: Rework IntermediateToken and LazyIntermediateToken #12032
Conversation
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
Add `IntermediateNodeFactory` static class with factory methods for creating CSharp and Html `IntermediateTokens`.
Basic clean up: - Enable nullability - Use constructors rather than property setters Note: The uses of the ! operator will be cleaned up in a later commit.
Introduce a `LazyContent` helper class that can be used to define content that is computed lazily. Use this helper class to allow `IntermediateToken` to directly support lazy content and remove `LazyIntermediateToken`. NOTE: There are some slight shenanigans to avoid updating test base lines due to `LazyIntermediateToken` being removed.
Make `IntermediateToken` abstract and add strongly-typed `CSharpIntermediateToken` and `HtmlIntermediateToken`.
Update each reference to these properties with type tests for CSharpIntermediateToken or HtmlIntermediateToken.
ToddGrun
reviewed
Jul 15, 2025
| { | ||
| public override IntermediateNodeCollection Children => IntermediateNodeCollection.ReadOnly; | ||
| public bool IsLazy { get; } |
There was a problem hiding this comment.
Yes, but it avoids a huge update to the test baselines. I wanted to prove that all tests pass with this change without updating any test baselines.
There was a problem hiding this comment.
If we keep it in to avoid the baseline, could we at least avoid the backing field?
ToddGrun
reviewed
Jul 15, 2025
| return; | ||
| } | ||
|
|
||
| // If it's a C# expression, we have to wrap it in parenthesize, otherwise things like ternary |
There was a problem hiding this comment.
actually, I was wrong, it's parentheses. 😄
|
Love it! |
chsienki
approved these changes
Jul 17, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This change refactors
IntermediateTokenandLazyIntermediateTokenin the IR nodes. The key goals are:IntermediateNodeFactory.CSharpToken(...)andIntermediateNodeFactory.HtmlToken(...)methods for constructing tokens. Later, these factory methods will make it easier to user interpolated string handlers to avoid allocating strings when creating tokens.KindandTokenKindproperties fromIntermediateToken. Instead, introduceCSharpIntermediateTokenandHtmlIntermediateTokentypes. This avoids using LINQ to filter byIsCSharpandIsHtml.IntermediateTokenandLazyIntermediateToken. Now, any token can have static or lazy content.The commit history is solid, so it might be preferrable to review commit-by-commit.
CR Build: https://dev.azure.com/dnceng/internal/_build/results?buildId=2749969&view=results
Test Insertion: https://dev.azure.com/devdiv/DevDiv/_git/VS/pullrequest/651521
Toolset Run: https://dev.azure.com/dnceng/internal/_build/results?buildId=2749970&view=results