Fix a bug in AlreadyChecked involving if statements where the clauses…

… aren't block statements Fixes #3914 PiperOrigin-RevId: 532573468
google · May 16, 2023 · 31d420b · 31d420b
1 parent c084186
commit 31d420b
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/AlreadyChecked.java b/core/src/main/java/com/google/errorprone/bugpatterns/AlreadyChecked.java
@@ -115,7 +115,7 @@ public Void visitThrow(ThrowTree tree, Void unused) {
 
     private void handleMethodExitingStatement() {
       TreePath ifPath = getCurrentPath().getParentPath();
-      Tree previous = null;
+      Tree previous = getCurrentPath().getLeaf();
       while (ifPath != null && ifPath.getLeaf() instanceof BlockTree) {
         previous = ifPath.getLeaf();
         ifPath = ifPath.getParentPath();

diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/AlreadyCheckedTest.java b/core/src/test/java/com/google/errorprone/bugpatterns/AlreadyCheckedTest.java
@@ -498,4 +498,22 @@ public void equalsCalledTwiceOnMutableType_noFinding() {
             "}")
         .doTest();
   }
+
+  @Test
+  public void i3914() {
+    helper
+        .addSourceLines(
+            "Test.java",
+            "import java.util.List;",
+            "class Test {",
+            "  void test(boolean a, boolean b) {",
+            "    if (a && b)",
+            "      return;",
+            "    if (a) {",
+            "    } else if (b) {",
+            "    }",
+            "  }",
+            "}")
+        .doTest();
+  }
 }