Merge pull request #76 from openjavaformat/switch-expression-declaration

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

Author: abashev

open-java-format/src/main/java/com/palantir/javaformat/java/JavaInputAstVisitor.java

@@ -3654,15 +3654,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);

open-java-format/src/main/java/com/palantir/javaformat/java/java14/Java14InputAstVisitor.java

@@ -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());

open-java-format/src/test/resources/com/palantir/javaformat/java/testdata/ExpressionSwitch.input

@@ -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,

open-java-format/src/test/resources/com/palantir/javaformat/java/testdata/ExpressionSwitch.output

@@ -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,
@@ -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) {