Fuse incorrect page directives #10907
Merged
Conversation
This file contains 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
jjonescz
reviewed
Sep 20, 2024
| @@ -5550,6 +5550,37 @@ @inherits BaseComponent<string?> | |||
| ]); | |||
| } | |||
|
|
|||
| [IntegrationTestFact] | |||
There was a problem hiding this comment.
nit: consider adding WorkItem attribute to the new tests
| { | ||
| // Act | ||
| var generated = CompileToCSharp(@" | ||
| @page ""MyPage"" |
There was a problem hiding this comment.
nit: consider using raw strings to avoid duplicate quotes
| @@ -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.
Why the change FirstOrDefault -> First? Is it guaranteed pageDirective.Tokens won't be empty?
There was a problem hiding this comment.
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 PageDirective_MissingRoute test to show that behavior.
333fred
reviewed
Sep 20, 2024
...Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
Show resolved
Hide resolved
chsienki
force-pushed
the
fuse_incorrect_page_directives
branch
from
1309db8
to
38e7f8b
Compare
jjonescz
approved these changes
Sep 20, 2024
333fred
approved these changes
Sep 20, 2024
ryzngard
approved these changes
Sep 22, 2024
This was referenced Sep 25, 2024
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.
Fixes #10863
Previously we didn't emit the page directive if it had an error. Now we do, so the user still gets syntax highlighting etc.