Skip to content
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

Use the roslyn tokenizer #10702

Merged
merged 17 commits into from
Aug 12, 2024
Merged

Use the roslyn tokenizer #10702

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
894a9ba
Remove unused ITokenizer interface, make tokenizers disposable.
333fred Aug 1, 2024
a15d7cc
Remove unneeded common states
333fred Aug 1, 2024
3a8fd07
Allow setting the next tokenizer state after a razor comment body is …
333fred Aug 1, 2024
60ac8d1
Plumb the Roslyn tokenizer through more tests
333fred Aug 1, 2024
73aa717
Nullable enable the tokenizer
333fred Aug 1, 2024
dcef8ed
Add consolidated syntax kinds. Since there aren't consumers that care…
333fred Aug 1, 2024
5749a8e
Give better error messages when syntax tree verification fails.
333fred Aug 1, 2024
2823f64
The big change: use the roslyn tokenizer for tokenizing C#.
333fred Aug 1, 2024
c25ac20
Update SyntaxKinds to the new consolidated kinds in tests.
333fred Aug 1, 2024
34ab111
Increase test coverage of a few scenarios, and bulk up existing tests.
333fred Aug 1, 2024
abd6aba
Skip test for now, give a better exception.
333fred Aug 1, 2024
acf7a60
Name change
333fred Aug 1, 2024
640d377
Better support giving errors on raw string literals, increase test co…
333fred Aug 2, 2024
3155200
PR feedback.
333fred Aug 2, 2024
1a0d57d
Convert to the correct type
333fred Aug 2, 2024
aa24f69
Additional commenting and PR feedback. I've simplified the reset loop…
333fred Aug 6, 2024
5b7e927
More feedback
333fred Aug 9, 2024
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
2 changes: 1 addition & 1 deletion ...mpiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Legacy/RoslynCSharpTokenizer.cs
View file
Open in desktop
Copy link
Member Author

Choose a reason for hiding this comment

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

I would honestly not try to diff this against the old code. Pretty much every line is touched. Just review as if it was a new implementation.

Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,7 @@ private StateResult Trivia()
CSharpSyntaxKind.WhitespaceTrivia => SyntaxKind.Whitespace,
CSharpSyntaxKind.EndOfLineTrivia => SyntaxKind.NewLine,
CSharpSyntaxKind.SingleLineCommentTrivia or CSharpSyntaxKind.MultiLineCommentTrivia or CSharpSyntaxKind.MultiLineDocumentationCommentTrivia or CSharpSyntaxKind.SingleLineDocumentationCommentTrivia => SyntaxKind.CSharpComment,
_ => throw new InvalidOperationException("Unexpected trivia kind."),
var kind => throw new InvalidOperationException($"Unexpected trivia kind: {kind}."),
};

return Stay(EndToken(tokenType));
Expand Down
2 changes: 1 addition & 1 deletion ...Compiler/test/Microsoft.NET.Sdk.Razor.SourceGenerators.Tests/RazorSourceGeneratorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1405,7 +1405,7 @@ public override void Process(TagHelperContext context, TagHelperOutput output)
Assert.Single(result.GeneratedSources);
}

[Fact, WorkItem("https://github.com/dotnet/razor/issues/7049")]
[Fact(Skip = "PROTOTYPE"), WorkItem("https://github.com/dotnet/razor/issues/7049")]
public async Task SourceGenerator_CshtmlFiles_TagHelperInFunction_ManualSuppression()
{
// Arrange
Expand Down
Loading