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
262 changes: 205 additions & 57 deletions src/Compiler/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpTokenizerLiteralTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,12 @@ public void String_Literal_Is_Recognized()
TestSingleToken("\"goo\"", SyntaxKind.StringLiteral);
}

[Fact]
public void String_Literal_Empty_string()
{
TestSingleToken("\"\"", SyntaxKind.StringLiteral);
}

[Fact]
public void String_Literal_Is_Terminated_By_EOF_If_Unterminated()
{
Expand Down Expand Up @@ -359,47 +365,47 @@ public void Verbatim_String_Literal_Allows_Trailing_Comments()
[Fact]
public void Interpolated_String_Is_Recognized()
{
TestTokenizer("""
TestSingleToken("""
$"Hello, {name}!"
""",
SyntaxFactory.Token(SyntaxKind.StringLiteral, """
$"Hello, {name}!"
"""));
SyntaxKind.StringLiteral);
}

[Fact]
public void Interpolated_String_Empty_String()
{
TestSingleToken("""
$""
""",
SyntaxKind.StringLiteral);
}

[Fact]
public void Interpolated_String_Allows_Nested_Strings()
{
TestTokenizer("""
TestSingleToken("""
$"Hello, {"world!"}!"
""",
SyntaxFactory.Token(SyntaxKind.StringLiteral, """
$"Hello, {"world!"}!"
"""));
SyntaxKind.StringLiteral);
}

[Fact]
public void Interpolated_String_Allows_Escaped_Curly_Braces()
{
TestTokenizer("""
TestSingleToken("""
$"Hello, {{name}}!"
""",
SyntaxFactory.Token(SyntaxKind.StringLiteral, """
$"Hello, {{name}}!"
"""));
SyntaxKind.StringLiteral);
}

[Fact]
public void Interpolated_String_Allows_Newlines_In_Interpolation_Hole()
{
TestTokenizer("""
TestSingleToken("""
$"Hello, {name
+ 1}!"
""",
SyntaxFactory.Token(SyntaxKind.StringLiteral, """
$"Hello, {name
+ 1}!"
"""));
SyntaxKind.StringLiteral);
}

[Fact]
Expand All @@ -417,121 +423,263 @@ public void Interpolated_String_Newlines_Terminate_Content()
[Fact]
public void Interpolated_String_EndOfFile_In_Interpolation_Hole_Ends_String()
{
TestTokenizer("""
TestSingleToken("""
$"Hello, {name + 1
""",
SyntaxFactory.Token(SyntaxKind.StringLiteral, """
$"Hello, {name + 1
"""));
SyntaxKind.StringLiteral);
}

[Fact]
public void Interpolated_String_Allows_Comment_In_Interpolation_Hole()
{
TestTokenizer("""
TestSingleToken("""
$"Hello, {name + 1 // Test!
}!"
""",
SyntaxFactory.Token(SyntaxKind.StringLiteral, """
$"Hello, {name + 1 // Test!
}!"
"""));
SyntaxKind.StringLiteral);
}

[Theory]
[InlineData("$@")]
[InlineData("@$")]
public void Verbatim_Interpolated_String_Is_Recognized(string prefix)
{
TestTokenizer($$"""
TestSingleToken($$"""
{{prefix}}"Hello, {name}!"
""",
SyntaxFactory.Token(SyntaxKind.StringLiteral, $$"""
{{prefix}}"Hello, {name}!"
"""));
SyntaxKind.StringLiteral);
}

[Theory]
[InlineData("$@")]
[InlineData("@$")]
public void Verbatim_Interpolated_String_Allows_Nested_Strings(string prefix)
{
TestTokenizer($$"""
TestSingleToken($$"""
{{prefix}}"Hello, {"world!"}!"
""",
SyntaxFactory.Token(SyntaxKind.StringLiteral, $$"""
{{prefix}}"Hello, {"world!"}!"
"""));
SyntaxKind.StringLiteral);
}

[Theory]
[InlineData("$@")]
[InlineData("@$")]
public void Verbatim_Interpolated_String_Allows_Escaped_Curly_Braces(string prefix)
{
TestTokenizer($$$"""
TestSingleToken($$$"""
{{{prefix}}}"Hello, {{name}}!"
""",
SyntaxFactory.Token(SyntaxKind.StringLiteral, $$$"""
{{{prefix}}}"Hello, {{name}}!"
"""));
SyntaxKind.StringLiteral);
}

[Theory]
[InlineData("$@")]
[InlineData("@$")]
public void Verbatim_Interpolated_String_Allows_Newlines_In_Interpolation_Hole(string prefix)
{
TestTokenizer($$"""
TestSingleToken($$"""
{{prefix}}"Hello, {name
+ 1}!"
""",
SyntaxFactory.Token(SyntaxKind.StringLiteral, $$"""
{{prefix}}"Hello, {name
+ 1}!"
"""));
SyntaxKind.StringLiteral);
}

[Theory]
[InlineData("$@")]
[InlineData("@$")]
public void Verbatim_Interpolated_String_Allows_Newlines_In_Content(string prefix)
{
TestTokenizer($$"""
TestSingleToken($$"""
{{prefix}}"Hello, {name + 1}
!"
""",
SyntaxFactory.Token(SyntaxKind.StringLiteral, $$"""
{{prefix}}"Hello, {name + 1}
!"
"""), IgnoreRemaining);
SyntaxKind.StringLiteral);
}

[Theory]
[InlineData("$@")]
[InlineData("@$")]
public void Verbatim_Interpolated_String_EndOfFile_In_Interpolation_Hole_Ends_String(string prefix)
{
TestTokenizer($$"""
TestSingleToken($$"""
{{prefix}}"Hello, {name + 1
""",
SyntaxFactory.Token(SyntaxKind.StringLiteral, $$"""
{{prefix}}"Hello, {name + 1
"""));
SyntaxKind.StringLiteral);
}

[Theory]
[InlineData("$@")]
[InlineData("@$")]
public void Verbatim_Interpolated_String_Allows_Comment_In_Interpolation_Hole(string prefix)
{
TestTokenizer($$"""
TestSingleToken($$"""
{{prefix}}"Hello, {name + 1 // Test!
}!"
""",
SyntaxFactory.Token(SyntaxKind.StringLiteral, $$"""
{{prefix}}"Hello, {name + 1 // Test!
}!"
"""));
SyntaxKind.StringLiteral);
}

[Theory]
[InlineData(""""
"""
"""")]
[InlineData("""""
""""
""""")]
[InlineData(""""""
"""""
"""""")]
public void Single_Line_Raw_String_Literal_Is_Recognized(string quotes)
{
TestSingleToken($"""
{quotes}goo{quotes}
""", SyntaxKind.StringLiteral);
}

[Theory, CombinatorialData]
public void Single_Line_Raw_Interpolated_String_Literal_Is_Recognized(
[CombinatorialValues("$", "$$", "$$$")]
string dollars,
[CombinatorialValues(""""
"""
"""",
"""""
""""
""""",
""""""
"""""
""""""
)]
string quotes)
{
TestSingleToken($"""
{dollars}{quotes}goo{quotes}
""", SyntaxKind.StringLiteral);
}

[Theory]
[InlineData(""""
"""
"""")]
[InlineData("""""
""""
""""")]
[InlineData(""""""
"""""
"""""")]
public void Multi_Line_Raw_String_Literal_Is_Recognized(string quotes)
{
TestSingleToken($"""
{quotes}
goo
{quotes}
""", SyntaxKind.StringLiteral);
}

[Theory, CombinatorialData]
public void Multi_Line_Raw_Interpolated_String_Literal_Is_Recognized(
[CombinatorialValues("$", "$$", "$$$")]
string dollars,
[CombinatorialValues(""""
"""
"""",
"""""
""""
""""",
""""""
"""""
""""""
)]
string quotes)
{
TestSingleToken($"""
{dollars}{quotes}
goo
{quotes}
""", SyntaxKind.StringLiteral);
}

[Theory]
[InlineData(""""
"""
"""")]
[InlineData("""""
""""
""""")]
[InlineData(""""""
"""""
"""""")]
public void Single_Line_Raw_String_Literal_Is_Terminated_By_EOF_If_Unterminated(string quotes)
{
TestSingleToken($"""
{quotes}goo
""", SyntaxKind.StringLiteral);
}

[Theory, CombinatorialData]
public void Single_Line_Raw_Interpolated_String_Literal_Is_Terminated_By_EOF_If_Unterminated(
[CombinatorialValues("$", "$$", "$$$")]
string dollars,
[CombinatorialValues(""""
"""
"""",
"""""
""""
""""",
""""""
"""""
""""""
)]
string quotes)
{
TestSingleToken($"""
{dollars}{quotes}goo
""", SyntaxKind.StringLiteral);
}

[Theory]
[InlineData(""""
"""
"""")]
[InlineData("""""
""""
""""")]
[InlineData(""""""
"""""
"""""")]
public void Multi_Line_Raw_String_Literal_Is_Terminated_By_EOF_If_Unterminated(string quotes)
{
TestSingleToken($"""
{quotes}
goo
""", SyntaxKind.StringLiteral);
}

[Theory, CombinatorialData]
public void Multi_Line_Raw_Interpolated_String_Literal_Is_Terminated_By_EOF_If_Unterminated(
[CombinatorialValues("$", "$$", "$$$")]
string dollars,
[CombinatorialValues(""""
"""
"""",
"""""
""""
""""",
""""""
"""""
""""""
)]
string quotes)
{
TestSingleToken($"""
{dollars}{quotes}
goo
""", SyntaxKind.StringLiteral);
}

[Fact]
public void Raw_Interpolated_String_Just_Dollars_Is_Recognized()
{
TestSingleToken("$$", SyntaxKind.StringLiteral);
}
}
Loading