-
Notifications
You must be signed in to change notification settings - Fork 199
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
Roslyn Tokenizer Infrastructure #10676
Merged
333fred
merged 4 commits into
dotnet:feature/roslyn-tokenizer
from
333fred:duplicate-info
Jul 29, 2024
Merged
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
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
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
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
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
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
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
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
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
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
96 changes: 96 additions & 0 deletions
96
...piler/Microsoft.AspNetCore.Razor.Language/legacyTest/Legacy/CSharpTokenizerCommentTest.cs
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
|
|
||
| #nullable disable | ||
|
|
||
| using Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax; | ||
| using Xunit; | ||
|
|
||
| namespace Microsoft.AspNetCore.Razor.Language.Legacy; | ||
|
|
||
| public class CSharpTokenizerCommentTest : CSharpTokenizerTestBase | ||
| { | ||
| private new SyntaxToken IgnoreRemaining => (SyntaxToken)base.IgnoreRemaining; | ||
|
|
||
| [Fact] | ||
| public void Next_Ignores_Star_At_EOF_In_RazorComment() | ||
| { | ||
| TestTokenizer( | ||
| "@* Foo * Bar * Baz *", | ||
| SyntaxFactory.Token(SyntaxKind.RazorCommentTransition, "@"), | ||
| SyntaxFactory.Token(SyntaxKind.RazorCommentStar, "*"), | ||
| SyntaxFactory.Token(SyntaxKind.RazorCommentLiteral, " Foo * Bar * Baz *")); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void Next_Ignores_Star_Without_Trailing_At() | ||
| { | ||
| TestTokenizer( | ||
| "@* Foo * Bar * Baz *@", | ||
| SyntaxFactory.Token(SyntaxKind.RazorCommentTransition, "@"), | ||
| SyntaxFactory.Token(SyntaxKind.RazorCommentStar, "*"), | ||
| SyntaxFactory.Token(SyntaxKind.RazorCommentLiteral, " Foo * Bar * Baz "), | ||
| SyntaxFactory.Token(SyntaxKind.RazorCommentStar, "*"), | ||
| SyntaxFactory.Token(SyntaxKind.RazorCommentTransition, "@")); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void Next_Returns_RazorComment_Token_For_Entire_Razor_Comment() | ||
| { | ||
| TestTokenizer( | ||
| "@* Foo Bar Baz *@", | ||
| SyntaxFactory.Token(SyntaxKind.RazorCommentTransition, "@"), | ||
| SyntaxFactory.Token(SyntaxKind.RazorCommentStar, "*"), | ||
| SyntaxFactory.Token(SyntaxKind.RazorCommentLiteral, " Foo Bar Baz "), | ||
| SyntaxFactory.Token(SyntaxKind.RazorCommentStar, "*"), | ||
| SyntaxFactory.Token(SyntaxKind.RazorCommentTransition, "@")); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void Next_Returns_Comment_Token_For_Entire_Single_Line_Comment() | ||
| { | ||
| TestTokenizer("// Foo Bar Baz", SyntaxFactory.Token(SyntaxKind.CSharpComment, "// Foo Bar Baz")); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void Single_Line_Comment_Is_Terminated_By_Newline() | ||
| { | ||
| TestTokenizer("// Foo Bar Baz\na", SyntaxFactory.Token(SyntaxKind.CSharpComment, "// Foo Bar Baz"), IgnoreRemaining); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void Multi_Line_Comment_In_Single_Line_Comment_Has_No_Effect() | ||
| { | ||
| TestTokenizer("// Foo/*Bar*/ Baz\na", SyntaxFactory.Token(SyntaxKind.CSharpComment, "// Foo/*Bar*/ Baz"), IgnoreRemaining); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void Next_Returns_Comment_Token_For_Entire_Multi_Line_Comment() | ||
| { | ||
| TestTokenizer("/* Foo\nBar\nBaz */", SyntaxFactory.Token(SyntaxKind.CSharpComment, "/* Foo\nBar\nBaz */")); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void Multi_Line_Comment_Is_Terminated_By_End_Sequence() | ||
| { | ||
| TestTokenizer("/* Foo\nBar\nBaz */a", SyntaxFactory.Token(SyntaxKind.CSharpComment, "/* Foo\nBar\nBaz */"), IgnoreRemaining); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void Unterminated_Multi_Line_Comment_Captures_To_EOF() | ||
| { | ||
| TestTokenizer("/* Foo\nBar\nBaz", SyntaxFactory.Token(SyntaxKind.CSharpComment, "/* Foo\nBar\nBaz"), IgnoreRemaining); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void Nested_Multi_Line_Comments_Terminated_At_First_End_Sequence() | ||
| { | ||
| TestTokenizer("/* Foo/*\nBar\nBaz*/ */", SyntaxFactory.Token(SyntaxKind.CSharpComment, "/* Foo/*\nBar\nBaz*/"), IgnoreRemaining); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void Nested_Multi_Line_Comments_Terminated_At_Full_End_Sequence() | ||
| { | ||
| TestTokenizer("/* Foo\nBar\nBaz* */", SyntaxFactory.Token(SyntaxKind.CSharpComment, "/* Foo\nBar\nBaz* */"), IgnoreRemaining); | ||
| } | ||
| } |
172 changes: 172 additions & 0 deletions
172
...er/Microsoft.AspNetCore.Razor.Language/legacyTest/Legacy/CSharpTokenizerIdentifierTest.cs
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,172 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
|
|
||
| #nullable disable | ||
|
|
||
| using Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax; | ||
| using Xunit; | ||
|
|
||
| namespace Microsoft.AspNetCore.Razor.Language.Legacy; | ||
|
|
||
| public class CSharpTokenizerIdentifierTest : CSharpTokenizerTestBase | ||
| { | ||
| [Fact] | ||
| public void Simple_Identifier_Is_Recognized() | ||
| { | ||
| TestTokenizer("foo", SyntaxFactory.Token(SyntaxKind.Identifier, "foo")); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void Identifier_Starting_With_Underscore_Is_Recognized() | ||
| { | ||
| TestTokenizer("_foo", SyntaxFactory.Token(SyntaxKind.Identifier, "_foo")); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void Identifier_Can_Contain_Digits() | ||
| { | ||
| TestTokenizer("foo4", SyntaxFactory.Token(SyntaxKind.Identifier, "foo4")); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void Identifier_Can_Start_With_Titlecase_Letter() | ||
| { | ||
| TestTokenizer("ῼfoo", SyntaxFactory.Token(SyntaxKind.Identifier, "ῼfoo")); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void Identifier_Can_Start_With_Letter_Modifier() | ||
| { | ||
| TestTokenizer("ᵊfoo", SyntaxFactory.Token(SyntaxKind.Identifier, "ᵊfoo")); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void Identifier_Can_Start_With_Other_Letter() | ||
| { | ||
| TestTokenizer("ƻfoo", SyntaxFactory.Token(SyntaxKind.Identifier, "ƻfoo")); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void Identifier_Can_Start_With_Number_Letter() | ||
| { | ||
| TestTokenizer("Ⅽool", SyntaxFactory.Token(SyntaxKind.Identifier, "Ⅽool")); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void Identifier_Can_Contain_Non_Spacing_Mark() | ||
| { | ||
| TestTokenizer("foo\u0300", SyntaxFactory.Token(SyntaxKind.Identifier, "foo\u0300")); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void Identifier_Can_Contain_Spacing_Combining_Mark() | ||
| { | ||
| TestTokenizer("fooः", SyntaxFactory.Token(SyntaxKind.Identifier, "fooः")); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void Identifier_Can_Contain_Non_English_Digit() | ||
| { | ||
| TestTokenizer("foo١", SyntaxFactory.Token(SyntaxKind.Identifier, "foo١")); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void Identifier_Can_Contain_Connector_Punctuation() | ||
| { | ||
| TestTokenizer("foo‿bar", SyntaxFactory.Token(SyntaxKind.Identifier, "foo‿bar")); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void Identifier_Can_Contain_Format_Character() | ||
| { | ||
| TestTokenizer("foobar", SyntaxFactory.Token(SyntaxKind.Identifier, "foobar")); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void Keywords_Are_Recognized_As_Keyword_Tokens() | ||
| { | ||
| TestKeyword("abstract"); | ||
| TestKeyword("byte"); | ||
| TestKeyword("class"); | ||
| TestKeyword("delegate"); | ||
| TestKeyword("event"); | ||
| TestKeyword("fixed"); | ||
| TestKeyword("if"); | ||
| TestKeyword("internal"); | ||
| TestKeyword("new"); | ||
| TestKeyword("override"); | ||
| TestKeyword("readonly"); | ||
| TestKeyword("short"); | ||
| TestKeyword("struct"); | ||
| TestKeyword("try"); | ||
| TestKeyword("unsafe"); | ||
| TestKeyword("volatile"); | ||
| TestKeyword("as"); | ||
| TestKeyword("do"); | ||
| TestKeyword("is"); | ||
| TestKeyword("params"); | ||
| TestKeyword("ref"); | ||
| TestKeyword("switch"); | ||
| TestKeyword("ushort"); | ||
| TestKeyword("while"); | ||
| TestKeyword("case"); | ||
| TestKeyword("const"); | ||
| TestKeyword("explicit"); | ||
| TestKeyword("float"); | ||
| TestKeyword("null"); | ||
| TestKeyword("sizeof"); | ||
| TestKeyword("typeof"); | ||
| TestKeyword("implicit"); | ||
| TestKeyword("private"); | ||
| TestKeyword("this"); | ||
| TestKeyword("using"); | ||
| TestKeyword("extern"); | ||
| TestKeyword("return"); | ||
| TestKeyword("stackalloc"); | ||
| TestKeyword("uint"); | ||
| TestKeyword("base"); | ||
| TestKeyword("catch"); | ||
| TestKeyword("continue"); | ||
| TestKeyword("double"); | ||
| TestKeyword("for"); | ||
| TestKeyword("in"); | ||
| TestKeyword("lock"); | ||
| TestKeyword("object"); | ||
| TestKeyword("protected"); | ||
| TestKeyword("static"); | ||
| TestKeyword("false"); | ||
| TestKeyword("public"); | ||
| TestKeyword("sbyte"); | ||
| TestKeyword("throw"); | ||
| TestKeyword("virtual"); | ||
| TestKeyword("decimal"); | ||
| TestKeyword("else"); | ||
| TestKeyword("operator"); | ||
| TestKeyword("string"); | ||
| TestKeyword("ulong"); | ||
| TestKeyword("bool"); | ||
| TestKeyword("char"); | ||
| TestKeyword("default"); | ||
| TestKeyword("foreach"); | ||
| TestKeyword("long"); | ||
| TestKeyword("void"); | ||
| TestKeyword("enum"); | ||
| TestKeyword("finally"); | ||
| TestKeyword("int"); | ||
| TestKeyword("out"); | ||
| TestKeyword("sealed"); | ||
| TestKeyword("true"); | ||
| TestKeyword("goto"); | ||
| TestKeyword("unchecked"); | ||
| TestKeyword("interface"); | ||
| TestKeyword("break"); | ||
| TestKeyword("checked"); | ||
| TestKeyword("namespace"); | ||
| TestKeyword("when"); | ||
| } | ||
|
|
||
| private void TestKeyword(string keyword) | ||
| { | ||
| TestTokenizer(keyword, SyntaxFactory.Token(SyntaxKind.Keyword, keyword)); | ||
| } | ||
| } |
Oops, something went wrong.
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.
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.
These tests are duplicates of the non-legacy versions, they just use the legacy parser.