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

fix: break between non-block if/else statements #633

Merged
merged 1 commit into from
Jan 14, 2024
Merged

fix: break between non-block if/else statements #633

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
4 changes: 3 additions & 1 deletion 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 @@ -205,7 +205,9 @@ export class BlocksAndStatementPrettierVisitor extends BaseCstPrettierPrinter {

const elseOnSameLine =
hasTrailingLineComments(ctx.statement[0]) ||
hasLeadingLineComments(ctx.Else[0])
hasLeadingLineComments(ctx.Else[0]) ||
!ctx.statement[0].children.statementWithoutTrailingSubstatement?.[0]
.children.block
? hardline
: " ";

Expand Down
18 changes: 12 additions & 6 deletions packages/prettier-plugin-java/test/unit-test/empty_statement/_output.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,23 +37,27 @@ public void forEachWithEmptyStatement(List<String> list) {
}

public void ifElseWithEmptyStatements() {
if (test); else {
if (test);
else {
System.out.println("one");
}

if (test) {
System.out.println("two");
} else;

if (test); else;
if (test);
else;
}

public void ifElseWithEmptyStatementsWithComments() {
if (test) /*test*/; else {
if (test) /*test*/;
else {
System.out.println("one");
}

if (test); /*test*/else {
if (test);
/*test*/else {
System.out.println("one");
}

Expand All @@ -65,9 +69,11 @@ public void ifElseWithEmptyStatementsWithComments() {
System.out.println("two");
} else;/*test*/

if (test); /*test*/else;/*test*/
if (test);
/*test*/else;/*test*/

if (test) /*test*/; else /*test*/;
if (test) /*test*/;
else /*test*/;
}

public void simpleWhileWithEmptyStatement(boolean one) {
Expand Down
8 changes: 3 additions & 5 deletions packages/prettier-plugin-java/test/unit-test/sealed/_output.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,9 @@ default Shape rotate(double angle) {
}

default String areaMessage() {
if (this instanceof Circle) return "Circle: " + area(); else if (
this instanceof Rectangle
) return "Rectangle: " + area(); else if (
this instanceof RightTriangle
) return "Triangle: " + area();
if (this instanceof Circle) return "Circle: " + area();
else if (this instanceof Rectangle) return "Rectangle: " + area();
else if (this instanceof RightTriangle) return "Triangle: " + area();
// :(
throw new IllegalArgumentException();
}
Expand Down