Remove CSharpKeywordKind #10648
Merged
Remove CSharpKeywordKind #10648
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
This type effectively duplicates a lot of Roslyn's SyntaxKind. So we just use that instead.
|
@dotnet/razor-compiler for review. This is an easily-extractable part of the lexer change, so I went ahead and pulled it out. |
DustinCampbell
approved these changes
Jul 18, 2024
| { "namespace", CSharpKeyword.Namespace }, | ||
| { "when", CSharpKeyword.When }, | ||
| { "where", CSharpKeyword.Where } | ||
| private static readonly Dictionary<string, CSharpSyntaxKind> _keywords = new Dictionary<string, CSharpSyntaxKind>(StringComparer.Ordinal) |
There was a problem hiding this comment.
Consider making this a FrozenDictionary in the future.
jjonescz
approved these changes
Jul 19, 2024
| @@ -2008,14 +2011,13 @@ private bool TryParseKeyword(in SyntaxListBuilder<RazorSyntaxNode> builder) | |||
|
|
|||
| private bool AtBooleanLiteral() | |||
| { | |||
| var result = CSharpTokenizer.GetTokenKeyword(CurrentToken); | |||
| return result.HasValue && (result.Value == CSharpKeyword.True || result.Value == CSharpKeyword.False); | |||
| return LegacyCSharpTokenizer.GetTokenKeyword(CurrentToken) is CSharpSyntaxKind.TrueKeyword or CSharpSyntaxKind.FalseKeyword; | |||
There was a problem hiding this comment.
What is LegacyCSharpTokenizer?
There was a problem hiding this comment.
It's sign I missed one thing when fixing up the cherry-pick
| { "checked", CSharpSyntaxKind.CheckedKeyword }, | ||
| { "namespace", CSharpSyntaxKind.NamespaceKeyword }, | ||
| { "when", CSharpSyntaxKind.WhenKeyword }, | ||
| { "where", CSharpSyntaxKind.WhereKeyword } | ||
| }; |
There was a problem hiding this comment.
Consider adding a test or assert that checks those match (stringifying the enum value gives back a string equal to the key)
maryamariyan
approved these changes
Jul 19, 2024
|
/azp run |
|
Azure Pipelines successfully started running 2 pipeline(s). |
jjonescz
reviewed
Jul 20, 2024
src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Legacy/CSharpTokenizer.cs
Outdated
Show resolved
Hide resolved
chsienki
approved these changes
Jul 22, 2024
This was referenced Jul 30, 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.
This type effectively duplicates a lot of Roslyn's SyntaxKind. So we just use that instead.