Remove unnecessary check of trailing trivia for directives. #71185
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
dotnet-issue-labeler
bot
added
Area-Compilers
untriaged
CyrusNajmabadi
changed the title
CyrusNajmabadi
commented
Dec 8, 2023
| { | ||
| foreach (var trivia in node.AsToken().LeadingTrivia) | ||
| GetDirectivesInTrivia(trivia, filter, ref directives); | ||
| } |
There was a problem hiding this comment.
simplified check and inlined.
CyrusNajmabadi
commented
Dec 8, 2023
| @@ -865,40 +868,21 @@ private static void GetDirectives<TDirective>(SyntaxNode node, Func<TDirective, | |||
| { | |||
| foreach (var trivia in node.DescendantTrivia(node => node.ContainsDirectives, descendIntoTrivia: true)) | |||
| { | |||
| _ = GetDirectivesInTrivia(trivia, filter, ref directives); | |||
| GetDirectivesInTrivia(trivia, filter, ref directives); | |||
There was a problem hiding this comment.
no need for return value.
CyrusNajmabadi
commented
Dec 8, 2023
| { | ||
| foreach (var tr in trivia) | ||
| { | ||
| if (!GetDirectivesInTrivia(tr, filter, ref directives) && tr.GetStructure() is SyntaxNode node) |
There was a problem hiding this comment.
directives can't be inside other structured trivia. THey are teh structured trivia. So just removed this.
|
@333fred @RikkiGibson ptal. |
333fred
approved these changes
Dec 9, 2023
RikkiGibson
approved these changes
Dec 11, 2023
| directives = new List<TDirective>(); | ||
| } | ||
|
|
||
| directives ??= []; |
ghost
added this to the 
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.
Directives can only be in leading trivia. So this walk is unnecessary.