Don't require // fall out comments on expression switches

google#2709 PiperOrigin-RevId: 565802684
PicnicSupermarket · Sep 15, 2023 · b8c865c · b8c865c
1 parent 19fefad
commit b8c865c
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/MissingDefault.java b/core/src/main/java/com/google/errorprone/bugpatterns/MissingDefault.java
@@ -75,7 +75,7 @@ public Description matchSwitch(SwitchTree tree, VisitorState state) {
     }
     CaseTree defaultCase = maybeDefault.get();
     List<? extends StatementTree> statements = defaultCase.getStatements();
-    if (statements != null && !statements.isEmpty()) {
+    if (statements == null || !statements.isEmpty()) {
       return NO_MATCH;
     }
     // If `default` case is empty, and last in switch, add `// fall out` comment

diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/MissingDefaultTest.java b/core/src/test/java/com/google/errorprone/bugpatterns/MissingDefaultTest.java
@@ -263,4 +263,23 @@ public void arrowSwitchNegative() {
             "}")
         .doTest();
   }
+
+  @Test
+  public void arrowComment() {
+    assumeTrue(RuntimeVersion.isAtLeast14());
+    compilationHelper
+        .addSourceLines(
+            "Test.java",
+            "class Test {",
+            "  void f() {}",
+            "  void m(int i) {",
+            "    switch (i) {",
+            "      case 0 -> f();",
+            "      case 1 -> f();",
+            "      default -> f();",
+            "    }",
+            "  }",
+            "}")
+        .doTest();
+  }
 }