PatternMatchingInstanceof: handle ternaries.

How'd I forget them? PiperOrigin-RevId: 716655410
google · Jan 17, 2025 · b9c272f · b9c272f
1 parent 7851fd2
commit b9c272f
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 0 deletions.
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/PatternMatchingInstanceof.java b/core/src/main/java/com/google/errorprone/bugpatterns/PatternMatchingInstanceof.java
@@ -35,6 +35,7 @@
 import com.sun.source.tree.AssignmentTree;
 import com.sun.source.tree.BinaryTree;
 import com.sun.source.tree.BlockTree;
+import com.sun.source.tree.ConditionalExpressionTree;
 import com.sun.source.tree.IfTree;
 import com.sun.source.tree.InstanceOfTree;
 import com.sun.source.tree.ParenthesizedTree;
@@ -194,6 +195,14 @@ private static ImmutableList<Tree> findImpliedStatements(
           }
           return impliedStatements.build();
         }
+        case CONDITIONAL_EXPRESSION -> {
+          var conditionalExpression = (ConditionalExpressionTree) parent;
+          impliedStatements.add(
+              negated
+                  ? conditionalExpression.getFalseExpression()
+                  : conditionalExpression.getTrueExpression());
+          return impliedStatements.build();
+        }
         default -> {
           return impliedStatements.build();
         }

diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/PatternMatchingInstanceofTest.java b/core/src/test/java/com/google/errorprone/bugpatterns/PatternMatchingInstanceofTest.java
@@ -591,4 +591,60 @@ public boolean equals(Object o) {
             """)
         .doTest();
   }
+
+  @Test
+  public void conditionalExpression() {
+    helper
+        .addInputLines(
+            "Test.java",
+            """
+            class Test {
+              private String val;
+
+              public String stringify(Object o) {
+                return o instanceof Test ? ((Test) o).val : "not a test";
+              }
+            }
+            """)
+        .addOutputLines(
+            "Test.java",
+            """
+            class Test {
+              private String val;
+
+              public String stringify(Object o) {
+                return o instanceof Test test ? test.val : "not a test";
+              }
+            }
+            """)
+        .doTest();
+  }
+
+  @Test
+  public void conditionalExpression_negated() {
+    helper
+        .addInputLines(
+            "Test.java",
+            """
+            class Test {
+              private String val;
+
+              public String stringify(Object o) {
+                return !(o instanceof Test) ? "not a test" : ((Test) o).val;
+              }
+            }
+            """)
+        .addOutputLines(
+            "Test.java",
+            """
+            class Test {
+              private String val;
+
+              public String stringify(Object o) {
+                return !(o instanceof Test test) ? "not a test" : test.val;
+              }
+            }
+            """)
+        .doTest();
+  }
 }