-
Notifications
You must be signed in to change notification settings - Fork 193
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
Fuse incorrect page directives #10907
Changes from 3 commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5550,6 +5550,37 @@ @inherits BaseComponent<string?> | |
]); | ||
} | ||
|
||
[IntegrationTestFact] | ||
public void PageDirective_NoForwardSlash() | ||
{ | ||
// Act | ||
var generated = CompileToCSharp(@" | ||
@page ""MyPage"" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nit: consider using raw strings to avoid duplicate quotes |
||
"); | ||
|
||
// Assert | ||
AssertDocumentNodeMatchesBaseline(generated.CodeDocument); | ||
AssertCSharpDocumentMatchesBaseline(generated.CodeDocument); | ||
CompileToAssembly(generated); | ||
} | ||
|
||
[IntegrationTestFact] | ||
public void PageDirective_MissingRoute() | ||
{ | ||
// Act | ||
var generated = CompileToCSharp(@" | ||
@page | ||
"); | ||
|
||
// Assert | ||
AssertDocumentNodeMatchesBaseline(generated.CodeDocument); | ||
|
||
// Design time writer doesn't correctly emit pragmas for missing tokens, so don't validate them in design time | ||
AssertCSharpDocumentMatchesBaseline(generated.CodeDocument, verifyLinePragmas: !DesignTime); | ||
CompileToAssembly(generated); | ||
} | ||
|
||
|
||
#endregion | ||
|
||
#region EventCallback | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
// <auto-generated/> | ||
#pragma warning disable 1591 | ||
namespace Test | ||
{ | ||
#line default | ||
using global::System; | ||
using global::System.Collections.Generic; | ||
using global::System.Linq; | ||
using global::System.Threading.Tasks; | ||
using global::Microsoft.AspNetCore.Components; | ||
#line default | ||
#line hidden | ||
#nullable restore | ||
public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase | ||
#nullable disable | ||
{ | ||
#pragma warning disable 219 | ||
private void __RazorDirectiveTokenHelpers__() { | ||
} | ||
#pragma warning restore 219 | ||
#pragma warning disable 0414 | ||
private static object __o = null; | ||
#pragma warning restore 0414 | ||
#pragma warning disable 1998 | ||
protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder) | ||
{ | ||
|
||
} | ||
#pragma warning restore 1998 | ||
} | ||
} | ||
#pragma warning restore 1591 |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
x:\dir\subdir\Test\TestComponent.cshtml(1,6): Error RZ1016: The 'page' directive expects a string surrounded by double quotes. |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
Document - | ||
NamespaceDeclaration - - Test | ||
UsingDirective - (3:1,1 [20] ) - global::System | ||
UsingDirective - (26:2,1 [40] ) - global::System.Collections.Generic | ||
UsingDirective - (69:3,1 [25] ) - global::System.Linq | ||
UsingDirective - (97:4,1 [36] ) - global::System.Threading.Tasks | ||
UsingDirective - (136:5,1 [45] ) - global::Microsoft.AspNetCore.Components | ||
ClassDeclaration - - public partial - TestComponent - global::Microsoft.AspNetCore.Components.ComponentBase - | ||
DesignTimeDirective - | ||
CSharpCode - | ||
IntermediateToken - - CSharp - #pragma warning disable 0414 | ||
CSharpCode - | ||
IntermediateToken - - CSharp - private static object __o = null; | ||
CSharpCode - | ||
IntermediateToken - - CSharp - #pragma warning restore 0414 | ||
MethodDeclaration - - protected override - void - BuildRenderTree | ||
MalformedDirective - (0:0,0 [5] x:\dir\subdir\Test\TestComponent.cshtml) - page | ||
CSharpCode - (5:0,5 [0] x:\dir\subdir\Test\TestComponent.cshtml) | ||
LazyIntermediateToken - (5:0,5 [0] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - | ||
HtmlContent - (5:0,5 [2] x:\dir\subdir\Test\TestComponent.cshtml) | ||
LazyIntermediateToken - (5:0,5 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
Source Location: (5:0,5 [0] x:\dir\subdir\Test\TestComponent.cshtml) | ||
|| | ||
Generated Location: (920:26,5 [0] ) | ||
|| | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
// <auto-generated/> | ||
#pragma warning disable 1591 | ||
namespace Test | ||
{ | ||
#line default | ||
using global::System; | ||
using global::System.Collections.Generic; | ||
using global::System.Linq; | ||
using global::System.Threading.Tasks; | ||
using global::Microsoft.AspNetCore.Components; | ||
#line default | ||
#line hidden | ||
#nullable restore | ||
public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase | ||
#nullable disable | ||
{ | ||
#pragma warning disable 219 | ||
private void __RazorDirectiveTokenHelpers__() { | ||
((global::System.Action)(() => { | ||
// language=Route,Component | ||
#nullable restore | ||
#line 1 "x:\dir\subdir\Test\TestComponent.cshtml" | ||
global::System.Object __typeHelper = "MyPage"; | ||
|
||
#line default | ||
#line hidden | ||
#nullable disable | ||
} | ||
))(); | ||
} | ||
#pragma warning restore 219 | ||
#pragma warning disable 0414 | ||
private static object __o = null; | ||
#pragma warning restore 0414 | ||
#pragma warning disable 1998 | ||
protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder) | ||
{ | ||
} | ||
#pragma warning restore 1998 | ||
} | ||
} | ||
#pragma warning restore 1591 |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
x:\dir\subdir\Test\TestComponent.cshtml(1,1): Error RZ9988: The @page directive must specify a route template. The route template must be enclosed in quotes and begin with the '/' character. |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
Document - | ||
NamespaceDeclaration - - Test | ||
UsingDirective - (3:1,1 [20] ) - global::System | ||
UsingDirective - (26:2,1 [40] ) - global::System.Collections.Generic | ||
UsingDirective - (69:3,1 [25] ) - global::System.Linq | ||
UsingDirective - (97:4,1 [36] ) - global::System.Threading.Tasks | ||
UsingDirective - (136:5,1 [45] ) - global::Microsoft.AspNetCore.Components | ||
ClassDeclaration - - public partial - TestComponent - global::Microsoft.AspNetCore.Components.ComponentBase - | ||
DesignTimeDirective - | ||
DirectiveToken - (6:0,6 [8] x:\dir\subdir\Test\TestComponent.cshtml) - "MyPage" | ||
CSharpCode - | ||
IntermediateToken - - CSharp - #pragma warning disable 0414 | ||
CSharpCode - | ||
IntermediateToken - - CSharp - private static object __o = null; | ||
CSharpCode - | ||
IntermediateToken - - CSharp - #pragma warning restore 0414 | ||
MethodDeclaration - - protected override - void - BuildRenderTree |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
Source Location: (6:0,6 [8] x:\dir\subdir\Test\TestComponent.cshtml) | ||
|"MyPage"| | ||
Generated Location: (749:22,37 [8] ) | ||
|"MyPage"| | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
// <auto-generated/> | ||
#pragma warning disable 1591 | ||
namespace Test | ||
{ | ||
#line default | ||
using global::System; | ||
using global::System.Collections.Generic; | ||
using global::System.Linq; | ||
using global::System.Threading.Tasks; | ||
using global::Microsoft.AspNetCore.Components; | ||
#line default | ||
#line hidden | ||
#nullable restore | ||
public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase | ||
#nullable disable | ||
{ | ||
#pragma warning disable 1998 | ||
protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder) | ||
{ | ||
} | ||
#pragma warning restore 1998 | ||
} | ||
} | ||
#pragma warning restore 1591 |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
x:\dir\subdir\Test\TestComponent.cshtml(1,6): Error RZ1016: The 'page' directive expects a string surrounded by double quotes. |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
Document - | ||
NamespaceDeclaration - - Test | ||
UsingDirective - (3:1,1 [22] ) - global::System | ||
UsingDirective - (26:2,1 [42] ) - global::System.Collections.Generic | ||
UsingDirective - (69:3,1 [27] ) - global::System.Linq | ||
UsingDirective - (97:4,1 [38] ) - global::System.Threading.Tasks | ||
UsingDirective - (136:5,1 [47] ) - global::Microsoft.AspNetCore.Components | ||
ClassDeclaration - - public partial - TestComponent - global::Microsoft.AspNetCore.Components.ComponentBase - | ||
MethodDeclaration - - protected override - void - BuildRenderTree | ||
MalformedDirective - (0:0,0 [5] x:\dir\subdir\Test\TestComponent.cshtml) - page | ||
CSharpCode - (5:0,5 [0] x:\dir\subdir\Test\TestComponent.cshtml) | ||
LazyIntermediateToken - (5:0,5 [0] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
// <auto-generated/> | ||
#pragma warning disable 1591 | ||
namespace Test | ||
{ | ||
#line default | ||
using global::System; | ||
using global::System.Collections.Generic; | ||
using global::System.Linq; | ||
using global::System.Threading.Tasks; | ||
using global::Microsoft.AspNetCore.Components; | ||
#line default | ||
#line hidden | ||
[global::Microsoft.AspNetCore.Components.RouteAttribute( | ||
// language=Route,Component | ||
#nullable restore | ||
#line (1,7)-(1,15) "x:\dir\subdir\Test\TestComponent.cshtml" | ||
"MyPage" | ||
|
||
#line default | ||
#line hidden | ||
#nullable disable | ||
)] | ||
#nullable restore | ||
public partial class TestComponent : global::Microsoft.AspNetCore.Components.ComponentBase | ||
#nullable disable | ||
{ | ||
#pragma warning disable 1998 | ||
protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder) | ||
{ | ||
} | ||
#pragma warning restore 1998 | ||
} | ||
} | ||
#pragma warning restore 1591 |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
x:\dir\subdir\Test\TestComponent.cshtml(1,1): Error RZ9988: The @page directive must specify a route template. The route template must be enclosed in quotes and begin with the '/' character. |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
Document - | ||
NamespaceDeclaration - - Test | ||
UsingDirective - (3:1,1 [22] ) - global::System | ||
UsingDirective - (26:2,1 [42] ) - global::System.Collections.Generic | ||
UsingDirective - (69:3,1 [27] ) - global::System.Linq | ||
UsingDirective - (97:4,1 [38] ) - global::System.Threading.Tasks | ||
UsingDirective - (136:5,1 [47] ) - global::Microsoft.AspNetCore.Components | ||
RouteAttributeExtensionNode - (6:0,6 [8] x:\dir\subdir\Test\TestComponent.cshtml) - "MyPage" | ||
ClassDeclaration - - public partial - TestComponent - global::Microsoft.AspNetCore.Components.ComponentBase - | ||
MethodDeclaration - - protected override - void - BuildRenderTree |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
Source Location: (6:0,6 [8] x:\dir\subdir\Test\TestComponent.cshtml) | ||
|"MyPage"| | ||
Generated Location: (504:16,0 [8] ) | ||
|"MyPage"| | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -59,15 +59,16 @@ protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentInte | |
var pageDirective = (DirectiveIntermediateNode)directives[i].Node; | ||
|
||
// The parser also adds errors for invalid syntax, we just need to not crash. | ||
var routeToken = pageDirective.Tokens.FirstOrDefault(); | ||
var routeToken = pageDirective.Tokens.First(); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why the change There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yeah, we won't ever actually encounter a page directive without tokens, because the way it parses goes down a different path. I added the |
||
|
||
if (routeToken is { Content: ['"', '/', .., '"'] content }) | ||
if (routeToken is not { Content: ['"', '/', .., '"'] }) | ||
{ | ||
@namespace.Children.Insert(index++, new RouteAttributeExtensionNode(content) { Source = routeToken.Source }); | ||
pageDirective.Diagnostics.Add(ComponentDiagnosticFactory.CreatePageDirective_MustSpecifyRoute(pageDirective.Source)); | ||
} | ||
else | ||
|
||
if (!codeDocument.GetCodeGenerationOptions().DesignTime || pageDirective.Diagnostics.Count == 0) | ||
{ | ||
pageDirective.Diagnostics.Add(ComponentDiagnosticFactory.CreatePageDirective_MustSpecifyRoute(pageDirective.Source)); | ||
@namespace.Children.Insert(index++, new RouteAttributeExtensionNode(routeToken.Content) { Source = routeToken.Source }); | ||
} | ||
} | ||
} | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: consider adding WorkItem attribute to the new tests