Fix a crash in expression switches

cushon · google-java-format Team · commit f5a9280558d4 · 2020-05-11T13:00:29.000-07:00
`throws` statements are allows to occur in non-block expression switch cases, which was causing the trailing `;` to be printed twice. Fixes google#477 PiperOrigin-RevId: 310974906
diff --git a/core/src/main/java/com/google/googlejavaformat/java/java14/Java14InputAstVisitor.java b/core/src/main/java/com/google/googlejavaformat/java/java14/Java14InputAstVisitor.java
@@ -223,7 +223,7 @@ public Void visitCase(CaseTree node, Void unused) {
         token(">");
         builder.space();
         scan(node.getBody(), null);
-        token(";");
+        builder.guessToken(";");
         break;
       default:
         throw new AssertionError(node.getCaseKind());
diff --git a/core/src/test/java/com/google/googlejavaformat/java/FormatterIntegrationTest.java b/core/src/test/java/com/google/googlejavaformat/java/FormatterIntegrationTest.java
@@ -47,7 +47,7 @@
 @RunWith(Parameterized.class)
 public class FormatterIntegrationTest {
 
-  private static final ImmutableSet<String> JAVA14_TESTS = ImmutableSet.of("java14");
+  private static final ImmutableSet<String> JAVA14_TESTS = ImmutableSet.of("java14", "I477");
 
   @Parameters(name = "{index}: {0}")
   public static Iterable<Object[]> data() throws IOException {
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/I477.input b/core/src/test/resources/com/google/googlejavaformat/java/testdata/I477.input
@@ -0,0 +1,17 @@
+class I477 {
+  public static String foo(int in) {
+    return switch (in) {
+      case 1 -> "A";
+      case 2 -> "B";
+      default -> throw new IllegalStateException("Unknown input " + in);
+    };
+  }
+
+  public static String foo(int in) {
+    return switch (in) {
+      case 1 -> "A";
+      case 2 -> "B";
+      default -> "C";
+    };
+  }
+}
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/I477.output b/core/src/test/resources/com/google/googlejavaformat/java/testdata/I477.output
@@ -0,0 +1,17 @@
+class I477 {
+  public static String foo(int in) {
+    return switch (in) {
+      case 1 -> "A";
+      case 2 -> "B";
+      default -> throw new IllegalStateException("Unknown input " + in);
+    };
+  }
+
+  public static String foo(int in) {
+    return switch (in) {
+      case 1 -> "A";
+      case 2 -> "B";
+      default -> "C";
+    };
+  }
+}
