Fix switch indentation for list patterns #75953
Open
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-IDE
untriaged
dotnet-policy-service
bot
added
Community
obonn1
force-pushed
the
feature/fix_switch_indentation_for_list
branch
from
d575e61
to
33c85a2
Compare
obonn1
force-pushed
the
feature/fix_switch_indentation_for_list
branch
from
33c85a2
to
cd5a93b
Compare
| @@ -5605,6 +5605,34 @@ public object Method(int i) | |||
| await AssertFormatAsync(expectedCode, code); | |||
| } | |||
|
|
|||
| [Fact, WorkItem("https://github.com/dotnet/roslyn/issues/72196")] | |||
| public async Task FormatSwitchExpression_ListPatternAligned() | |||
| { | |||
There was a problem hiding this comment.
can you please use 'raw string literals' for test cases. There is a code refactoring to fix this up btw.
| @@ -262,6 +262,11 @@ private static void AddBracketIndentationOperation(List<IndentBlockOperation> li | |||
| // Brackets in list patterns are formatted like blocks, so align close bracket with open bracket | |||
| AddIndentBlockOperation(list, bracketPair.openBracket.GetNextToken(includeZeroWidth: true), bracketPair.closeBracket.GetPreviousToken(includeZeroWidth: true)); | |||
|
|
|||
| if (IsSwitchExpressionPattern(node)) | |||
There was a problem hiding this comment.
this needs a 'why' explanation as to why we don't want to execute teh rest of the code if we hit such a thing.
| @@ -279,6 +284,11 @@ private static void AddBracketIndentationOperation(List<IndentBlockOperation> li | |||
| } | |||
| } | |||
|
|
|||
| private static bool IsSwitchExpressionPattern(SyntaxNode node) | |||
There was a problem hiding this comment.
nit: i would personally inline this. It's only called in one place, and has very simple logic. If you do want to keep this as a helper method, that's ok.
--
"nits" are ideas/gentle-suggestions. But i'm deferring to your judgement here on what you prefer.
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 indentation of a list pattern or collection expression is (according to pre-existing comment in the adjusted method) "relative to the start of the line the prior token is on if we're on the same line as it." However, the code was missing a check for the two tokens being on the same line.