Skip to content

Fix comments after default switch case expressions #1420

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

Merged
merged 2 commits into from
Sep 29, 2025
Merged

Fix comments after default switch case expressions #1420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b4696c
fix comment after default case
crogoz Sep 25, 2025
78dc770
wrongly format the expression input
crogoz Sep 29, 2025
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 palantir-java-format/src/main/java/com/palantir/javaformat/java/JavaInputAstVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1854,6 +1854,7 @@ public Void visitSwitch(SwitchTree node, Void unused) {
}

protected void visitSwitch(ExpressionTree expression, List<? extends CaseTree> cases) {
builder.open(ZERO);
token("switch");
builder.space();
token("(");
Expand All @@ -1874,7 +1875,8 @@ protected void visitSwitch(ExpressionTree expression, List<? extends CaseTree> c
builder.close();
builder.forcedBreak();
builder.blankLineWanted(BlankLineWanted.NO);
token("}", plusFour);
token("}", plusTwo);
builder.close();
}

@Override
Expand Down
16 changes: 16 additions & 0 deletions ...va-format/src/test/resources/com/palantir/javaformat/java/testdata/ExpressionSwitch.input
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,20 @@ class ExpressionSwitch {
case 2 -> throw new IllegalArgumentException();
default -> throw new IllegalStateException();};
}


public void testWithComments(int y) {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this the intended snippet for the before? I couldn't see what the difference was manually, and both diff and difft report no differences.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, without this change, the formatter would put the "}" on the same line as the comment - which breaks the compilation eg.

        x = switch (y) {
            case 1 -> 1;
            // after case 1
            case 2 -> throw new IllegalArgumentException();
            // after case 2
            default -> throw new IllegalStateException();
            // after default case};

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah, are you able to put that in the description, it's quite hard to tell what's being fixed from just the code + PR description

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've changed the input to a wrongly formatted switch expression here

int x;
x = switch (y) {
case 1 ->
1;
// after case 1
case 2 ->
throw new IllegalArgumentException();
// after case 2
default ->
throw new IllegalStateException();
// after default case
};
}
}
12 changes: 12 additions & 0 deletions ...a-format/src/test/resources/com/palantir/javaformat/java/testdata/ExpressionSwitch.output
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,16 @@ class ExpressionSwitch {
default -> throw new IllegalStateException();
};
}

public void testWithComments(int y) {
int x;
x = switch (y) {
case 1 -> 1;
// after case 1
case 2 -> throw new IllegalArgumentException();
// after case 2
default -> throw new IllegalStateException();
// after default case
};
}
}