Skip to content

Start a switch expression on the line of the declaration it initializes #76

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
abashev merged 2 commits into from
Sep 25, 2026
Merged

Start a switch expression on the line of the declaration it initializes #76

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
610278d
Don't break line when switch expression used in declaration assignmen…
pkoenig10 Sep 23, 2026
522fab5
Keep an input in the old shape in the switch expression golden
abashev Sep 25, 2026
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
13 changes: 4 additions & 9 deletions open-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 @@ -3621,15 +3621,10 @@ int declareOne(
initializer.get().accept(this, null);
builder.close();
} else {
if (builder.peekToken().get().equals("switch")) {
// TODO(fawind): Don't break switch expression assignment
builder.open(Indent.If.make(typeBreak, plusFour, ZERO));
} else {
builder.open(
Indent.If.make(typeBreak, plusFour, ZERO),
BreakBehaviours.breakOnlyIfInnerLevelsThenFitOnOneLine(true),
LastLevelBreakability.ABORT);
}
builder.open(
Indent.If.make(typeBreak, plusFour, ZERO),
BreakBehaviours.breakOnlyIfInnerLevelsThenFitOnOneLine(true),
LastLevelBreakability.ABORT);
{
builder.breakToFill(" ");
scan(initializer.get(), null);
Expand Down
1 change: 0 additions & 1 deletion ...-java-format/src/main/java/com/palantir/javaformat/java/java14/Java14InputAstVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,6 @@ public Void visitCase(CaseTree node, Void unused) {
builder.close();
}
builder.guessToken(";");
builder.forcedBreak(minusTwo);
break;
default:
throw new IllegalArgumentException(node.getCaseKind().name());
Expand Down
7 changes: 7 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 @@ -23,6 +23,13 @@ class ExpressionSwitch {
return val;
}

static final int FIELD =
switch (KIND) {
case 0 -> 1;
case 1 -> 2;
default -> throw new IllegalStateException();
};

int wrapping(Wrapping w) {
switch (w) {
case THIS_IS_A_VERY_LONG_ENUM_VALUE_ONE,
Expand Down
28 changes: 16 additions & 12 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 @@ -20,15 +20,20 @@ class ExpressionSwitch {
}

int assignment(int j) {
boolean val =
switch (j) {
case 0 -> true;
case 1 -> false;
default -> false;
};
boolean val = switch (j) {
case 0 -> true;
case 1 -> false;
default -> false;
};
return val;
}

static final int FIELD = switch (KIND) {
case 0 -> 1;
case 1 -> 2;
default -> throw new IllegalStateException();
};

int wrapping(Wrapping w) {
switch (w) {
case THIS_IS_A_VERY_LONG_ENUM_VALUE_ONE,
Expand All @@ -49,12 +54,11 @@ class ExpressionSwitch {
}

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

public void test2(int y) {
Expand Down
Loading