Skip to content

Split Razor components into decl/impl before tag-helper resolution #84577

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
chsienki merged 6 commits into from
Jul 22, 2026
Merged

Split Razor components into decl/impl before tag-helper resolution #84577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
065bd3c
Add the Razor markup-split analysis library
chsienki Jul 21, 2026
2b730a2
Split components into decl/impl before tag-helper resolution
chsienki Jul 21, 2026
f3f5a31
Merge branch 'features/sonic' into sonic/decl-impl-early-split
chsienki Jul 22, 2026
b3ce36e
Fix banned-API violation and slice-boundary source mapping in markup …
chsienki Jul 22, 2026
fbcfdb9
Regenerate SwitchExpression_WithMarkupInLambdaArms baseline for the m…
chsienki Jul 22, 2026
0a6d80d
PR feedback
chsienki Jul 22, 2026
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
450 changes: 450 additions & 0 deletions .../Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/MarkupSplitterComponentTest.cs
View file
Open in desktop

@davidwengier davidwengier Jul 22, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I haven't looked at the parser yet (and might not be able to understand it anyway 😛) but is it worth adding test coverage for a class defined inside a @code block, which has a method/property, which has markup?

Large diffs are not rendered by default.

685 changes: 685 additions & 0 deletions src/Razor/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/MarkupSplitterTest.cs
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions src/Razor/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/RazorProjectEngineTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ private static void AssertDefaultPhases(RazorProjectEngine engine)
phase => Assert.IsType<DefaultRazorSyntaxTreePhase>(phase),
phase => Assert.IsType<DefaultRazorTagHelperContextDiscoveryPhase>(phase),
phase => Assert.IsType<DefaultRazorIntermediateNodeLoweringPhase>(phase),
phase => Assert.IsType<DefaultRazorMarkupSplitPhase>(phase),
phase => Assert.IsType<DefaultTagHelperResolutionPhase>(phase),
phase => Assert.IsType<DefaultRazorTagHelperRewritePhase>(phase),
phase => Assert.IsType<DefaultRazorDocumentClassifierPhase>(phase),
Expand Down
12 changes: 6 additions & 6 deletions ...grationTests/ComponentCodeGenerationTest/Component_WithCssScope/TestComponent.builder.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
[0000] AddMarkupContent("<h1 TestCssScope>Element with no attributes</h1>\r\n")
[0000] OpenElement("li")
[0001] AddAttribute("data-index", i)
[0001] OpenElement("parent")
[0002] AddAttribute("TestCssScope")
[0002] AddAttribute("with-attributes", "yes")
[0003] AddAttribute("with-csharp-attribute-value", 123)
[0003] AddContent("Something ")
[0004] AddAttribute("TestCssScope")
[0004] AddContent(i)
[0005] AddMarkupContent("<child TestCssScope></child>\r\n ")
[0006] AddMarkupContent("<child has multiple attributes=\"some with values\" TestCssScope>With text</child>\r\n ")
[0007] OpenComponent<global::Test.TemplatedComponent>()
Expand All @@ -25,4 +20,9 @@
[0019] AddAttribute("another-attr", "Another attr value")
[0020] AddAttribute("value", global::Microsoft.AspNetCore.Components.BindConverter.FormatValue( myVariable ))
[0021] AddAttribute("onchange", global::Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => myVariable = __value, myVariable))
[0022] AddAttribute("TestCssScope")
[0022] AddAttribute("TestCssScope")
[0023] OpenElement("li")
[0024] AddAttribute("data-index", i)
[0025] AddAttribute("TestCssScope")
[0026] AddContent("Something ")
[0027] AddContent(i)
46 changes: 46 additions & 0 deletions ...egrationTests/ComponentCodeGenerationTest/Component_WithCssScope/TestComponent.codegen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,52 @@ protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.

}
#pragma warning restore 1998
#nullable restore
#line (21,1)-(26,1) "x:\dir\subdir\Test\TestComponent.cshtml"

void MethodRenderingMarkup(RenderTreeBuilder __builder)
{
for (var i = 0; i < 10; i++)
{

#line default
#line hidden
#nullable disable

__builder.OpenElement(23, "li");
__builder.AddAttribute(24, "data-index",
#nullable restore
#line (26,29)-(26,30) "x:\dir\subdir\Test\TestComponent.cshtml"
i

#line default
#line hidden
#nullable disable
);
__builder.AddAttribute(25, "TestCssScope");
__builder.AddContent(26, "Something ");
#nullable restore
#line (26,42)-(26,43) 25 "x:\dir\subdir\Test\TestComponent.cshtml"
__builder.AddContent(27, i

#line default
#line hidden
#nullable disable
);
__builder.CloseElement();
#nullable restore
#line (27,1)-(33,1) "x:\dir\subdir\Test\TestComponent.cshtml"
}

System.GC.KeepAlive(myElementReference);
System.GC.KeepAlive(myComponentReference);
System.GC.KeepAlive(myVariable);
}

#line default
#line hidden
#nullable disable

}
}
#pragma warning restore 1591
35 changes: 5 additions & 30 deletions ...ionTests/ComponentCodeGenerationTest/Component_WithCssScope/TestComponent.decl.codegen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,50 +27,25 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
#nullable disable
{
#nullable restore
#line (17,8)-(26,1) "x:\dir\subdir\Test\TestComponent.cshtml"
#line (17,8)-(19,1) "x:\dir\subdir\Test\TestComponent.cshtml"

ElementReference myElementReference;
TemplatedComponent myComponentReference;
string myVariable;

void MethodRenderingMarkup(RenderTreeBuilder __builder)
{
for (var i = 0; i < 10; i++)
{

#line default
#line hidden
#nullable disable

__builder.OpenElement(0, "li");
__builder.AddAttribute(1, "data-index",
#nullable restore
#line (26,29)-(26,30) "x:\dir\subdir\Test\TestComponent.cshtml"
i
#line (19,1)-(20,1) "x:\dir\subdir\Test\TestComponent.cshtml"
TemplatedComponent myComponentReference;

#line default
#line hidden
#nullable disable
);
__builder.AddAttribute(2, "TestCssScope");
__builder.AddContent(3, "Something ");
#nullable restore
#line (26,42)-(26,43) 24 "x:\dir\subdir\Test\TestComponent.cshtml"
__builder.AddContent(4, i

#line default
#line hidden
#nullable disable
);
__builder.CloseElement();
#nullable restore
#line (27,1)-(33,1) "x:\dir\subdir\Test\TestComponent.cshtml"
}

System.GC.KeepAlive(myElementReference);
System.GC.KeepAlive(myComponentReference);
System.GC.KeepAlive(myVariable);
}
#line (20,1)-(21,1) "x:\dir\subdir\Test\TestComponent.cshtml"
string myVariable;

#line default
#line hidden
Expand Down
51 changes: 12 additions & 39 deletions ...nTests/ComponentCodeGenerationTest/Component_WithCssScope/TestComponent.decl.mappings.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,53 +8,26 @@ Source Location: (45:1,1 [47] x:\dir\subdir\Test\TestComponent.cshtml)
Generated Location: (524:18,0 [47] )
|using Microsoft.AspNetCore.Components.Rendering|

Source Location: (651:16,7 [233] x:\dir\subdir\Test\TestComponent.cshtml)
Source Location: (651:16,7 [44] x:\dir\subdir\Test\TestComponent.cshtml)
|
ElementReference myElementReference;
TemplatedComponent myComponentReference;
string myVariable;

void MethodRenderingMarkup(RenderTreeBuilder __builder)
{
for (var i = 0; i < 10; i++)
{
|
Generated Location: (869:30,0 [233] )
Generated Location: (869:30,0 [44] )
|
ElementReference myElementReference;
TemplatedComponent myComponentReference;
string myVariable;

void MethodRenderingMarkup(RenderTreeBuilder __builder)
{
for (var i = 0; i < 10; i++)
{
|

Source Location: (912:25,28 [1] x:\dir\subdir\Test\TestComponent.cshtml)
|i|
Generated Location: (1329:48,0 [1] )
|i|

Source Location: (925:25,41 [1] x:\dir\subdir\Test\TestComponent.cshtml)
|i|
Generated Location: (1605:58,24 [1] )
|i|

Source Location: (933:26,0 [164] x:\dir\subdir\Test\TestComponent.cshtml)
| }

System.GC.KeepAlive(myElementReference);
System.GC.KeepAlive(myComponentReference);
System.GC.KeepAlive(myVariable);
}
Source Location: (695:18,0 [46] x:\dir\subdir\Test\TestComponent.cshtml)
| TemplatedComponent myComponentReference;
|
Generated Location: (1047:39,0 [46] )
| TemplatedComponent myComponentReference;
|
Generated Location: (1787:67,0 [164] )
| }

System.GC.KeepAlive(myElementReference);
System.GC.KeepAlive(myComponentReference);
System.GC.KeepAlive(myVariable);
}
Source Location: (741:19,0 [24] x:\dir\subdir\Test\TestComponent.cshtml)
| string myVariable;
|
Generated Location: (1227:47,0 [24] )
| string myVariable;
|

42 changes: 42 additions & 0 deletions ...rationTests/ComponentCodeGenerationTest/Component_WithCssScope/TestComponent.mappings.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,45 @@ Generated Location: (4078:108,0 [3] )
|}
|

Source Location: (765:20,0 [119] x:\dir\subdir\Test\TestComponent.cshtml)
|
void MethodRenderingMarkup(RenderTreeBuilder __builder)
{
for (var i = 0; i < 10; i++)
{
|
Generated Location: (4264:118,0 [119] )
|
void MethodRenderingMarkup(RenderTreeBuilder __builder)
{
for (var i = 0; i < 10; i++)
{
|

Source Location: (912:25,28 [1] x:\dir\subdir\Test\TestComponent.cshtml)
|i|
Generated Location: (4612:132,0 [1] )
|i|

Source Location: (925:25,41 [1] x:\dir\subdir\Test\TestComponent.cshtml)
|i|
Generated Location: (4891:142,25 [1] )
|i|

Source Location: (933:26,0 [164] x:\dir\subdir\Test\TestComponent.cshtml)
| }

System.GC.KeepAlive(myElementReference);
System.GC.KeepAlive(myComponentReference);
System.GC.KeepAlive(myVariable);
}
|
Generated Location: (5073:151,0 [164] )
| }

System.GC.KeepAlive(myElementReference);
System.GC.KeepAlive(myComponentReference);
System.GC.KeepAlive(myVariable);
}
|

63 changes: 63 additions & 0 deletions ...odeGenerationTest/Legacy_3_1_WhiteSpace_InMarkupInFunctionsBlock/TestComponent.codegen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,69 @@ protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.
{
}
#pragma warning restore 1998
#nullable restore
#line (2,8)-(5,1) "x:\dir\subdir\Test\TestComponent.cshtml"

void MyMethod(RenderTreeBuilder __builder)
{

#line default
#line hidden
#nullable disable

__builder.AddContent(0, " ");
__builder.OpenElement(1, "ul");
__builder.AddMarkupContent(2, "\r\n");
#nullable restore
#line (6,1)-(6,13) "x:\dir\subdir\Test\TestComponent.cshtml"


#line default
#line hidden
#nullable disable

#nullable restore
#line (6,14)-(8,1) "x:\dir\subdir\Test\TestComponent.cshtml"
for (var i = 0; i < 100; i++)
{

#line default
#line hidden
#nullable disable

__builder.AddContent(3, " ");
__builder.OpenElement(4, "li");
__builder.AddMarkupContent(5, "\r\n ");
#nullable restore
#line (9,22)-(9,23) 24 "x:\dir\subdir\Test\TestComponent.cshtml"
__builder.AddContent(6, i

#line default
#line hidden
#nullable disable
);
__builder.AddMarkupContent(7, "\r\n ");
__builder.CloseElement();
__builder.AddMarkupContent(8, "\r\n");
#nullable restore
#line (11,1)-(12,1) "x:\dir\subdir\Test\TestComponent.cshtml"
}

#line default
#line hidden
#nullable disable

__builder.AddContent(9, " ");
__builder.CloseElement();
__builder.AddMarkupContent(10, "\r\n");
#nullable restore
#line (13,1)-(14,1) "x:\dir\subdir\Test\TestComponent.cshtml"
}

#line default
#line hidden
#nullable disable

}
}
#pragma warning restore 1591
63 changes: 0 additions & 63 deletions ...nerationTest/Legacy_3_1_WhiteSpace_InMarkupInFunctionsBlock/TestComponent.decl.codegen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,69 +20,6 @@ namespace Test
public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase
#nullable disable
{
#nullable restore
#line (2,8)-(5,1) "x:\dir\subdir\Test\TestComponent.cshtml"

void MyMethod(RenderTreeBuilder __builder)
{

#line default
#line hidden
#nullable disable

__builder.AddContent(0, " ");
__builder.OpenElement(1, "ul");
__builder.AddMarkupContent(2, "\r\n");
#nullable restore
#line (6,1)-(6,13) "x:\dir\subdir\Test\TestComponent.cshtml"


#line default
#line hidden
#nullable disable

#nullable restore
#line (6,14)-(8,1) "x:\dir\subdir\Test\TestComponent.cshtml"
for (var i = 0; i < 100; i++)
{

#line default
#line hidden
#nullable disable

__builder.AddContent(3, " ");
__builder.OpenElement(4, "li");
__builder.AddMarkupContent(5, "\r\n ");
#nullable restore
#line (9,22)-(9,23) 24 "x:\dir\subdir\Test\TestComponent.cshtml"
__builder.AddContent(6, i

#line default
#line hidden
#nullable disable
);
__builder.AddMarkupContent(7, "\r\n ");
__builder.CloseElement();
__builder.AddMarkupContent(8, "\r\n");
#nullable restore
#line (11,1)-(12,1) "x:\dir\subdir\Test\TestComponent.cshtml"
}

#line default
#line hidden
#nullable disable

__builder.AddContent(9, " ");
__builder.CloseElement();
__builder.AddMarkupContent(10, "\r\n");
#nullable restore
#line (13,1)-(14,1) "x:\dir\subdir\Test\TestComponent.cshtml"
}

#line default
#line hidden
#nullable disable

}
}
#pragma warning restore 1591
Loading