Skip to content

Remove LazyContent and eagerize intermediate token content creation #13054

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

Draft
Copilot wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Remove LazyContent and eagerize intermediate token content creation #13054

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5db7abf
Initial plan
Copilot Apr 15, 2026
117bca4
Remove LazyContent and lazy intermediate token infrastructure
Copilot Apr 15, 2026
6a6f646
perf: update benchmark baseline to Microsoft.NET.Sdk.Razor.SourceGene…
Copilot Apr 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
32 changes: 16 additions & 16 deletions ...1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.ir.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,33 +29,33 @@
IntermediateToken - - CSharp - #pragma warning restore 0414
MethodDeclaration - - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
HtmlContent - (0:0,0 [4] Basic.cshtml)
LazyIntermediateToken - (0:0,0 [4] Basic.cshtml) - Html - <div
IntermediateToken - (0:0,0 [4] Basic.cshtml) - Html - <div
HtmlAttribute - (4:0,4 [25] Basic.cshtml) - class=" - "
CSharpExpressionAttributeValue - (12:0,12 [16] Basic.cshtml) -
LazyIntermediateToken - (13:0,13 [15] Basic.cshtml) - CSharp - this.ToString()
IntermediateToken - (13:0,13 [15] Basic.cshtml) - CSharp - this.ToString()
HtmlContent - (29:0,29 [24] Basic.cshtml)
LazyIntermediateToken - (29:0,29 [1] Basic.cshtml) - Html - >
LazyIntermediateToken - (30:0,30 [23] Basic.cshtml) - Html - \n Hello world\n
IntermediateToken - (29:0,29 [1] Basic.cshtml) - Html - >
IntermediateToken - (30:0,30 [23] Basic.cshtml) - Html - \n Hello world\n
CSharpExpression - (54:2,5 [29] Basic.cshtml)
LazyIntermediateToken - (54:2,5 [29] Basic.cshtml) - CSharp - string.Format("{0}", "Hello")
IntermediateToken - (54:2,5 [29] Basic.cshtml) - CSharp - string.Format("{0}", "Hello")
HtmlContent - (83:2,34 [10] Basic.cshtml)
LazyIntermediateToken - (83:2,34 [2] Basic.cshtml) - Html - \n
LazyIntermediateToken - (85:3,0 [6] Basic.cshtml) - Html - </div>
LazyIntermediateToken - (91:3,6 [2] Basic.cshtml) - Html - \n
IntermediateToken - (83:2,34 [2] Basic.cshtml) - Html - \n
IntermediateToken - (85:3,0 [6] Basic.cshtml) - Html - </div>
IntermediateToken - (91:3,6 [2] Basic.cshtml) - Html - \n
CSharpCode - (95:4,2 [25] Basic.cshtml)
LazyIntermediateToken - (95:4,2 [25] Basic.cshtml) - CSharp - \n var cls = "foo";\n
IntermediateToken - (95:4,2 [25] Basic.cshtml) - CSharp - \n var cls = "foo";\n
HtmlContent - (123:7,0 [2] Basic.cshtml)
LazyIntermediateToken - (123:7,0 [2] Basic.cshtml) - Html - <p
IntermediateToken - (123:7,0 [2] Basic.cshtml) - Html - <p
HtmlAttribute - (125:7,2 [34] Basic.cshtml) - class=" - "
CSharpCodeAttributeValue - (133:7,10 [25] Basic.cshtml) -
LazyIntermediateToken - (134:7,11 [18] Basic.cshtml) - CSharp - if(cls != null) {
IntermediateToken - (134:7,11 [18] Basic.cshtml) - CSharp - if(cls != null) {
CSharpExpression - (153:7,30 [3] Basic.cshtml)
LazyIntermediateToken - (153:7,30 [3] Basic.cshtml) - CSharp - cls
LazyIntermediateToken - (156:7,33 [2] Basic.cshtml) - CSharp - }
IntermediateToken - (153:7,30 [3] Basic.cshtml) - CSharp - cls
IntermediateToken - (156:7,33 [2] Basic.cshtml) - CSharp - }
HtmlContent - (159:7,36 [5] Basic.cshtml)
LazyIntermediateToken - (159:7,36 [1] Basic.cshtml) - Html -
LazyIntermediateToken - (160:7,37 [2] Basic.cshtml) - Html - />
LazyIntermediateToken - (162:7,39 [2] Basic.cshtml) - Html - \n
IntermediateToken - (159:7,36 [1] Basic.cshtml) - Html -
IntermediateToken - (160:7,37 [2] Basic.cshtml) - Html - />
IntermediateToken - (162:7,39 [2] Basic.cshtml) - Html - \n
Inject -
Inject -
Inject -
Expand Down
16 changes: 8 additions & 8 deletions ...les/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,29 +32,29 @@
IntermediateToken - - CSharp - #pragma warning restore 0414
MethodDeclaration - - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
HtmlContent - (85:1,0 [2] IncompleteDirectives.cshtml)
LazyIntermediateToken - (85:1,0 [2] IncompleteDirectives.cshtml) - Html - \n
IntermediateToken - (85:1,0 [2] IncompleteDirectives.cshtml) - Html - \n
MalformedDirective - (87:2,0 [6] IncompleteDirectives.cshtml) - model
CSharpCode - (93:2,6 [0] IncompleteDirectives.cshtml)
LazyIntermediateToken - (93:2,6 [0] IncompleteDirectives.cshtml) - CSharp -
IntermediateToken - (93:2,6 [0] IncompleteDirectives.cshtml) - CSharp -
HtmlContent - (93:2,6 [2] IncompleteDirectives.cshtml)
LazyIntermediateToken - (93:2,6 [2] IncompleteDirectives.cshtml) - Html - \n
IntermediateToken - (93:2,6 [2] IncompleteDirectives.cshtml) - Html - \n
MalformedDirective - (95:3,0 [7] IncompleteDirectives.cshtml) - model
DirectiveToken - (102:3,7 [0] IncompleteDirectives.cshtml) -
HtmlContent - (102:3,7 [4] IncompleteDirectives.cshtml)
LazyIntermediateToken - (102:3,7 [4] IncompleteDirectives.cshtml) - Html - \n\n
IntermediateToken - (102:3,7 [4] IncompleteDirectives.cshtml) - Html - \n\n
MalformedDirective - (106:5,0 [7] IncompleteDirectives.cshtml) - inject
CSharpCode - (113:5,7 [0] IncompleteDirectives.cshtml)
LazyIntermediateToken - (113:5,7 [0] IncompleteDirectives.cshtml) - CSharp -
IntermediateToken - (113:5,7 [0] IncompleteDirectives.cshtml) - CSharp -
HtmlContent - (113:5,7 [2] IncompleteDirectives.cshtml)
LazyIntermediateToken - (113:5,7 [2] IncompleteDirectives.cshtml) - Html - \n
IntermediateToken - (113:5,7 [2] IncompleteDirectives.cshtml) - Html - \n
MalformedDirective - (115:6,0 [8] IncompleteDirectives.cshtml) - inject
DirectiveToken - (123:6,8 [0] IncompleteDirectives.cshtml) -
HtmlContent - (123:6,8 [2] IncompleteDirectives.cshtml)
LazyIntermediateToken - (123:6,8 [2] IncompleteDirectives.cshtml) - Html - \n
IntermediateToken - (123:6,8 [2] IncompleteDirectives.cshtml) - Html - \n
MalformedDirective - (125:7,0 [25] IncompleteDirectives.cshtml) - inject
DirectiveToken - (133:7,8 [17] IncompleteDirectives.cshtml) - MyService<TModel>
HtmlContent - (150:7,25 [2] IncompleteDirectives.cshtml)
LazyIntermediateToken - (150:7,25 [2] IncompleteDirectives.cshtml) - Html - \n
IntermediateToken - (150:7,25 [2] IncompleteDirectives.cshtml) - Html - \n
Inject -
Inject -
Inject -
Expand Down
16 changes: 8 additions & 8 deletions ...tFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,29 +12,29 @@
ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> -
MethodDeclaration - - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
HtmlContent - (85:1,0 [2] IncompleteDirectives.cshtml)
LazyIntermediateToken - (85:1,0 [2] IncompleteDirectives.cshtml) - Html - \n
IntermediateToken - (85:1,0 [2] IncompleteDirectives.cshtml) - Html - \n
MalformedDirective - (87:2,0 [6] IncompleteDirectives.cshtml) - model
CSharpCode - (93:2,6 [0] IncompleteDirectives.cshtml)
LazyIntermediateToken - (93:2,6 [0] IncompleteDirectives.cshtml) - CSharp -
IntermediateToken - (93:2,6 [0] IncompleteDirectives.cshtml) - CSharp -
HtmlContent - (93:2,6 [2] IncompleteDirectives.cshtml)
LazyIntermediateToken - (93:2,6 [2] IncompleteDirectives.cshtml) - Html - \n
IntermediateToken - (93:2,6 [2] IncompleteDirectives.cshtml) - Html - \n
MalformedDirective - (95:3,0 [7] IncompleteDirectives.cshtml) - model
DirectiveToken - (102:3,7 [0] IncompleteDirectives.cshtml) -
HtmlContent - (102:3,7 [4] IncompleteDirectives.cshtml)
LazyIntermediateToken - (102:3,7 [4] IncompleteDirectives.cshtml) - Html - \n\n
IntermediateToken - (102:3,7 [4] IncompleteDirectives.cshtml) - Html - \n\n
MalformedDirective - (106:5,0 [7] IncompleteDirectives.cshtml) - inject
CSharpCode - (113:5,7 [0] IncompleteDirectives.cshtml)
LazyIntermediateToken - (113:5,7 [0] IncompleteDirectives.cshtml) - CSharp -
IntermediateToken - (113:5,7 [0] IncompleteDirectives.cshtml) - CSharp -
HtmlContent - (113:5,7 [2] IncompleteDirectives.cshtml)
LazyIntermediateToken - (113:5,7 [2] IncompleteDirectives.cshtml) - Html - \n
IntermediateToken - (113:5,7 [2] IncompleteDirectives.cshtml) - Html - \n
MalformedDirective - (115:6,0 [8] IncompleteDirectives.cshtml) - inject
DirectiveToken - (123:6,8 [0] IncompleteDirectives.cshtml) -
HtmlContent - (123:6,8 [2] IncompleteDirectives.cshtml)
LazyIntermediateToken - (123:6,8 [2] IncompleteDirectives.cshtml) - Html - \n
IntermediateToken - (123:6,8 [2] IncompleteDirectives.cshtml) - Html - \n
MalformedDirective - (125:7,0 [25] IncompleteDirectives.cshtml) - inject
DirectiveToken - (133:7,8 [17] IncompleteDirectives.cshtml) - MyService<TModel>
HtmlContent - (150:7,25 [2] IncompleteDirectives.cshtml)
LazyIntermediateToken - (150:7,25 [2] IncompleteDirectives.cshtml) - Html - \n
IntermediateToken - (150:7,25 [2] IncompleteDirectives.cshtml) - Html - \n
Inject -
Inject -
Inject -
Expand Down
2 changes: 1 addition & 1 deletion ...es/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.ir.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
IntermediateToken - - CSharp - #pragma warning restore 0414
MethodDeclaration - - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
HtmlContent - (10:0,10 [6] InvalidNamespaceAtEOF.cshtml)
LazyIntermediateToken - (10:0,10 [6] InvalidNamespaceAtEOF.cshtml) - Html - Test.
IntermediateToken - (10:0,10 [6] InvalidNamespaceAtEOF.cshtml) - Html - Test.
Inject -
Inject -
Inject -
Expand Down
8 changes: 4 additions & 4 deletions ...IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.ir.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
IntermediateToken - - CSharp - #pragma warning restore 0414
MethodDeclaration - - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
HtmlContent - (17:1,0 [2] ModelExpressionTagHelper.cshtml)
LazyIntermediateToken - (17:1,0 [2] ModelExpressionTagHelper.cshtml) - Html - \n
IntermediateToken - (17:1,0 [2] ModelExpressionTagHelper.cshtml) - Html - \n
HtmlContent - (62:2,43 [4] ModelExpressionTagHelper.cshtml)
LazyIntermediateToken - (62:2,43 [4] ModelExpressionTagHelper.cshtml) - Html - \n\n
IntermediateToken - (62:2,43 [4] ModelExpressionTagHelper.cshtml) - Html - \n\n
TagHelper - (66:4,0 [25] ModelExpressionTagHelper.cshtml) - input-test - TagMode.SelfClosing
DefaultTagHelperBody -
DefaultTagHelperCreate - - InputTestTagHelper
Expand All @@ -47,7 +47,7 @@
IntermediateToken - - CSharp - )
DefaultTagHelperExecute -
HtmlContent - (91:4,25 [2] ModelExpressionTagHelper.cshtml)
LazyIntermediateToken - (91:4,25 [2] ModelExpressionTagHelper.cshtml) - Html - \n
IntermediateToken - (91:4,25 [2] ModelExpressionTagHelper.cshtml) - Html - \n
TagHelper - (93:5,0 [27] ModelExpressionTagHelper.cshtml) - input-test - TagMode.SelfClosing
DefaultTagHelperBody -
DefaultTagHelperCreate - - InputTestTagHelper
Expand All @@ -58,7 +58,7 @@
IntermediateToken - - CSharp - )
DefaultTagHelperExecute -
HtmlContent - (120:5,27 [2] ModelExpressionTagHelper.cshtml)
LazyIntermediateToken - (120:5,27 [2] ModelExpressionTagHelper.cshtml) - Html - \n
IntermediateToken - (120:5,27 [2] ModelExpressionTagHelper.cshtml) - Html - \n
Inject -
Inject -
Inject -
Expand Down
32 changes: 16 additions & 16 deletions .../test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.ir.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,26 +34,26 @@
IntermediateToken - - CSharp - #pragma warning restore 0414
MethodDeclaration - - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
HtmlContent - (17:1,0 [2] Sections.cshtml)
LazyIntermediateToken - (17:1,0 [2] Sections.cshtml) - Html - \n
IntermediateToken - (17:1,0 [2] Sections.cshtml) - Html - \n
HtmlContent - (62:2,43 [4] Sections.cshtml)
LazyIntermediateToken - (62:2,43 [4] Sections.cshtml) - Html - \n\n
IntermediateToken - (62:2,43 [4] Sections.cshtml) - Html - \n\n
CSharpCode - (68:4,2 [46] Sections.cshtml)
LazyIntermediateToken - (68:4,2 [46] Sections.cshtml) - CSharp - \n Layout = "_SectionTestLayout.cshtml";\n
IntermediateToken - (68:4,2 [46] Sections.cshtml) - CSharp - \n Layout = "_SectionTestLayout.cshtml";\n
HtmlContent - (117:7,0 [26] Sections.cshtml)
LazyIntermediateToken - (117:7,0 [2] Sections.cshtml) - Html - \n
LazyIntermediateToken - (119:8,0 [4] Sections.cshtml) - Html - <div
LazyIntermediateToken - (123:8,4 [1] Sections.cshtml) - Html - >
LazyIntermediateToken - (124:8,5 [9] Sections.cshtml) - Html - Some body
LazyIntermediateToken - (133:8,14 [6] Sections.cshtml) - Html - </div>
LazyIntermediateToken - (139:8,20 [4] Sections.cshtml) - Html - \n\n
IntermediateToken - (117:7,0 [2] Sections.cshtml) - Html - \n
IntermediateToken - (119:8,0 [4] Sections.cshtml) - Html - <div
IntermediateToken - (123:8,4 [1] Sections.cshtml) - Html - >
IntermediateToken - (124:8,5 [9] Sections.cshtml) - Html - Some body
IntermediateToken - (133:8,14 [6] Sections.cshtml) - Html - </div>
IntermediateToken - (139:8,20 [4] Sections.cshtml) - Html - \n\n
Section - - Section1
HtmlContent - (162:10,19 [43] Sections.cshtml)
LazyIntermediateToken - (162:10,19 [6] Sections.cshtml) - Html - \n
LazyIntermediateToken - (168:11,4 [4] Sections.cshtml) - Html - <div
LazyIntermediateToken - (172:11,8 [1] Sections.cshtml) - Html - >
LazyIntermediateToken - (173:11,9 [20] Sections.cshtml) - Html - This is in Section 1
LazyIntermediateToken - (193:11,29 [6] Sections.cshtml) - Html - </div>
LazyIntermediateToken - (199:11,35 [6] Sections.cshtml) - Html - \n
IntermediateToken - (162:10,19 [6] Sections.cshtml) - Html - \n
IntermediateToken - (168:11,4 [4] Sections.cshtml) - Html - <div
IntermediateToken - (172:11,8 [1] Sections.cshtml) - Html - >
IntermediateToken - (173:11,9 [20] Sections.cshtml) - Html - This is in Section 1
IntermediateToken - (193:11,29 [6] Sections.cshtml) - Html - </div>
IntermediateToken - (199:11,35 [6] Sections.cshtml) - Html - \n
TagHelper - (205:12,4 [25] Sections.cshtml) - input-test - TagMode.SelfClosing
DefaultTagHelperBody -
DefaultTagHelperCreate - - InputTestTagHelper
Expand All @@ -65,7 +65,7 @@
IntermediateToken - - CSharp - )
DefaultTagHelperExecute -
HtmlContent - (230:12,29 [2] Sections.cshtml)
LazyIntermediateToken - (230:12,29 [2] Sections.cshtml) - Html - \n
IntermediateToken - (230:12,29 [2] Sections.cshtml) - Html - \n
Inject -
Inject -
Inject -
Expand Down
10 changes: 5 additions & 5 deletions ...s/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.ir.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,21 +33,21 @@
IntermediateToken - - CSharp - #pragma warning restore 0414
MethodDeclaration - - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
HtmlContent - (26:0,26 [2] ViewComponentTagHelper.cshtml)
LazyIntermediateToken - (26:0,26 [2] ViewComponentTagHelper.cshtml) - Html - \n
IntermediateToken - (26:0,26 [2] ViewComponentTagHelper.cshtml) - Html - \n
CSharpCode - (30:1,2 [26] ViewComponentTagHelper.cshtml)
LazyIntermediateToken - (30:1,2 [26] ViewComponentTagHelper.cshtml) - CSharp - \n var foo = "Hello";\n
IntermediateToken - (30:1,2 [26] ViewComponentTagHelper.cshtml) - CSharp - \n var foo = "Hello";\n
HtmlContent - (59:4,0 [2] ViewComponentTagHelper.cshtml)
LazyIntermediateToken - (59:4,0 [2] ViewComponentTagHelper.cshtml) - Html - \n
IntermediateToken - (59:4,0 [2] ViewComponentTagHelper.cshtml) - Html - \n
TagHelper - (61:5,0 [50] ViewComponentTagHelper.cshtml) - vc:test - TagMode.StartTagAndEndTag
DefaultTagHelperBody -
DefaultTagHelperCreate - - AllTagHelper
DefaultTagHelperCreate - - AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper.__Generated__TestViewComponentTagHelper
DefaultTagHelperProperty - (82:5,21 [4] ViewComponentTagHelper.cshtml) - first-name - string TestViewComponentTagHelper.firstName - HtmlAttributeValueStyle.DoubleQuotes
CSharpExpression - (83:5,22 [3] ViewComponentTagHelper.cshtml)
LazyIntermediateToken - (83:5,22 [3] ViewComponentTagHelper.cshtml) - CSharp - foo
IntermediateToken - (83:5,22 [3] ViewComponentTagHelper.cshtml) - CSharp - foo
DefaultTagHelperProperty - (93:5,32 [6] ViewComponentTagHelper.cshtml) - bar - string AllTagHelper.Bar - HtmlAttributeValueStyle.DoubleQuotes
HtmlContent - (93:5,32 [6] ViewComponentTagHelper.cshtml)
LazyIntermediateToken - (93:5,32 [6] ViewComponentTagHelper.cshtml) - Html - World
IntermediateToken - (93:5,32 [6] ViewComponentTagHelper.cshtml) - Html - World
DefaultTagHelperExecute -
Inject -
Inject -
Expand Down
Loading