F1 help for #if and #else refers to preprocessor symbols, not if_CSharpKeyword and else_CSharpkeyword
#69192
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
The F1 service should produce `#if` instead of `if_CSharpKeyword` when the cursor is on the `#if` symbol. Add other tasks for the other preprocessor symbols related to conditional compilation. The `#if` and `#else` fail, because the model finds child nodes for `if` and `else`, respectively. The tests for `#elif` and `#endif` pass, because the model does not find child nodes for those tokens.
dotnet-issue-labeler
bot
added
Area-IDE
untriaged
ghost
added
the
Community
Because the `#if` and `#else` preprocessor tokens contain the text for keywords (`if` and `else`), the `TryGetTextForKeyword` would lock to those keywords before the `TryGetTextForPreProcessor` looked for the preprocessor token. By switching the order of those two tests, the longer preprocessor tokens are found first.
The "if" and "else" nodes may appear as "if" / "else" or "#if" / "#else". If the parent isn't the if statement or else clause, don't treat them as keywords. Then, the later processing will find them as preprocessor tokens and correctly route the request.
|
ping @CyrusNajmabadi |
|
Commit notes for reviewers:
|
|
looking. |
|
Let me take a stab at this. |
| TryGetTextForPreProcessor(token, out text) || | ||
| TryGetTextForKeyword(token, out text) || |
There was a problem hiding this comment.
have pp checks come first so we defer to the pp interepretation if inside a directive.
|
|
||
| if (token.IsKind(SyntaxKind.EndOfDirectiveToken) && token.GetAncestor<RegionDirectiveTriviaSyntax>() != null) |
There was a problem hiding this comment.
unified the behavior here so it works for any directive, not just regions.
| { | ||
| text = Keyword("defaultline"); | ||
| return true; | ||
| } |
There was a problem hiding this comment.
moved from the keyword handling case to the directive handling case.
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.
The F1 service should produce
#ifinstead ofif_CSharpKeywordwhen the cursor is on the#ifsymbol.Fixes dotnet/docs#35715
Add tests for the F1 service on
#ifand related tokens. Then, when checking for keywords, make sure thatifandelsehave the proper statement token as the parent token. Otherwise, that text is part of the preprocessor token.