Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: no break in single-block switch case #636

Merged
merged 1 commit into from
Feb 13, 2024
Merged

fix: no break in single-block switch case #636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions packages/prettier-plugin-java/src/printers/blocks-and-statements.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,13 +265,20 @@ export class BlocksAndStatementPrettierVisitor extends BaseCstPrettierPrinter {

switchBlockStatementGroup(ctx: SwitchBlockStatementGroupCtx) {
const switchLabel = this.visit(ctx.switchLabel);

const blockStatements = this.visit(ctx.blockStatements);

const statements = ctx.blockStatements?.[0].children.blockStatement;
const hasSingleStatementBlock =
statements?.length === 1 &&
statements[0].children.statement?.[0].children
.statementWithoutTrailingSubstatement?.[0].children.block !== undefined;

return concat([
switchLabel,
ctx.Colon[0],
blockStatements && indent([hardline, blockStatements])
hasSingleStatementBlock
? concat([" ", blockStatements])
: blockStatements && indent([hardline, blockStatements])
]);
}

Expand Down
35 changes: 35 additions & 0 deletions packages/prettier-plugin-java/test/unit-test/switch/_input.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,41 @@ public String shouldWrapEvenForSmallSwitchCases() {
switch (answer) { case "YES": return "YES"; default: return "NO"; }
}

void switchCaseWithBlock1() {
switch (a) {
case 0: {}
default: {}
}
}

void switchCaseWithBlock2() {
switch (a) {
case 0: { b(); }
default: { c(); }
}
}

void switchCaseWithBlock3() {
switch (a) {
case 0: { b(); } { c(); }
default: { d(); } { e(); }
}
}

void switchCaseWithBlock4() {
switch (a) {
case 0: b(); { c(); }
default: d(); { e(); }
}
}

void switchCaseWithBlock5() {
switch (a) {
case 0: { b(); } c();
default: { d(); } e();
}
}

// Switch rules
static void howManyAgain(int k) {
switch (k) {
Expand Down
67 changes: 67 additions & 0 deletions packages/prettier-plugin-java/test/unit-test/switch/_output.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,73 @@ public String shouldWrapEvenForSmallSwitchCases() {
}
}

void switchCaseWithBlock1() {
switch (a) {
case 0: {}
default: {}
}
}

void switchCaseWithBlock2() {
switch (a) {
case 0: {
b();
}
default: {
c();
}
}
}

void switchCaseWithBlock3() {
switch (a) {
case 0:
{
b();
}
{
c();
}
default:
{
d();
}
{
e();
}
}
}

void switchCaseWithBlock4() {
switch (a) {
case 0:
b();
{
c();
}
default:
d();
{
e();
}
}
}

void switchCaseWithBlock5() {
switch (a) {
case 0:
{
b();
}
c();
default:
{
d();
}
e();
}
}

// Switch rules
static void howManyAgain(int k) {
switch (k) {
Expand Down