Fix line breaks in switch expression #394
Merged
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
Generate changelog in
|
fawind
changed the title
fawind
commented
Jan 6, 2021
| sync(node); | ||
| // Also format switch expressions as statement body instead of inlining them | ||
| boolean statementBody = node.getBodyKind() == LambdaExpressionTree.BodyKind.STATEMENT | ||
| || node.getBody().getKind() == Kind.SWITCH_EXPRESSION; |
There was a problem hiding this comment.
Fix for case 1. This has to be in the Java14InputAstVisitor.java class to not break java 11 compatibility.
There was a problem hiding this comment.
should we add some kind of todo to collapse once we drop 11 (probably several years out)
There was a problem hiding this comment.
Added the todo.
But tbh, once we drop java 11 compat, we would collapse the whole Java14InputAstVisitor with the base class.
fawind
commented
Jan 6, 2021
| boolean first = true; | ||
| for (ExpressionTree expression : node.getExpressions()) { | ||
| if (!first) { | ||
| token(","); | ||
| builder.space(); | ||
| builder.breakOp(" "); |
fawind
commented
Jan 6, 2021
| @@ -226,12 +231,30 @@ public Void visitCase(CaseTree node, Void unused) { | |||
| token("-"); | |||
| token(">"); | |||
| builder.space(); | |||
| scan(node.getBody(), null); | |||
| if (node.getBody().getKind() == BLOCK) { | |||
| visitBlock( | |||
There was a problem hiding this comment.
For collapsing empty case blocks: case ENUM -> {}
There was a problem hiding this comment.
Mind adding this as a source comment? :-)
CRogers
approved these changes
Jan 6, 2021
|
Released 2.0.1 |
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.
Before this PR
Switch expressions were incorrectly formatted in two cases as reported in #383:
Supplier<Integer> closeDelimiter(int k) { return () -> switch (k) { case 0 -> true; - default -> false;}; + default -> false; + }; }int wrapping(Wrapping w) { switch (w) { - case THIS_IS_A_VERY_LONG_ENUM_VALUE_ONE, THIS_IS_A_VERY_LONG_ENUM_VALUE_TWO, THIS_IS_A_VERY_LONG_ENUM_VALUE_THREE -> {} + case THIS_IS_A_VERY_LONG_ENUM_VALUE_ONE, + THIS_IS_A_VERY_LONG_ENUM_VALUE_TWO, + THIS_IS_A_VERY_LONG_ENUM_VALUE_THREE -> {} } }After this PR
==COMMIT_MSG==
Fix line breaks in switch expression
==COMMIT_MSG==
cc @pkoenig10