Make ConstantPatternCompile suppressible.

PiperOrigin-RevId: 487181889
google · Nov 9, 2022 · 7d5048c · 7d5048c
1 parent 4e12b54
commit 7d5048c
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 8 deletions.
diff --git a/check_api/src/main/java/com/google/errorprone/bugpatterns/BugChecker.java b/check_api/src/main/java/com/google/errorprone/bugpatterns/BugChecker.java
@@ -87,6 +87,7 @@
 import com.sun.source.tree.VariableTree;
 import com.sun.source.tree.WhileLoopTree;
 import com.sun.source.tree.WildcardTree;
+import com.sun.source.util.TreePath;
 import com.sun.source.util.TreePathScanner;
 import com.sun.source.util.TreeScanner;
 import com.sun.tools.javac.code.Symbol;
@@ -561,15 +562,18 @@ public SuppressibleTreePathScanner(VisitorState state) {
 
     @Override
     public A scan(Tree tree, B b) {
+      return suppressed(tree) ? null : super.scan(tree, b);
+    }
+
+    @Override
+    public A scan(TreePath treePath, B b) {
+      return suppressed(treePath.getLeaf()) ? null : super.scan(treePath, b);
+    }
+
+    private boolean suppressed(Tree tree) {
       boolean isSuppressible =
           tree instanceof ClassTree || tree instanceof MethodTree || tree instanceof VariableTree;
-      if (isSuppressible) {
-        boolean suppressed = state != null ? isSuppressed(tree, state) : isSuppressed(tree);
-        if (suppressed) {
-          return null;
-        }
-      }
-      return super.scan(tree, b);
+      return isSuppressible && isSuppressed(tree, state);
     }
   }
 }
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/ConstantPatternCompile.java b/core/src/main/java/com/google/errorprone/bugpatterns/ConstantPatternCompile.java
@@ -89,7 +89,7 @@ public Description matchClass(ClassTree classTree, VisitorState state) {
     SuggestedFix.Builder fixBuilder = SuggestedFix.builder();
     Tree[] firstHit = new Tree[1];
     for (Tree member : classTree.getMembers()) {
-      new TreePathScanner<Void, Void>() {
+      new SuppressibleTreePathScanner<Void, Void>(state) {
         @Override
         public Void visitClass(ClassTree node, Void unused) {
           // Don't descend into nested classes - we'll visit them later

diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/ConstantPatternCompileTest.java b/core/src/test/java/com/google/errorprone/bugpatterns/ConstantPatternCompileTest.java
@@ -420,4 +420,21 @@ public void withinList_noFinding() {
             "}")
         .doTest();
   }
+
+  @Test
+  public void suppressible() {
+    testHelper
+        .addInputLines(
+            "in/Test.java",
+            "import java.util.regex.Matcher;",
+            "import java.util.regex.Pattern;",
+            "class Test {",
+            "  @SuppressWarnings(\"ConstantPatternCompile\")",
+            "  boolean isCar(String input) {",
+            "    return Pattern.compile(\"car\").matcher(input).matches();",
+            "  }",
+            "}")
+        .expectUnchanged()
+        .doTest();
+  }
 }