Only fire InjectOnBugCheckers on the actual @BugPattern.

PiperOrigin-RevId: 510439885
google · Feb 17, 2023 · 9f50f70 · 9f50f70
1 parent 716fd7c
commit 9f50f70
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/InjectOnBugCheckers.java b/core/src/main/java/com/google/errorprone/bugpatterns/InjectOnBugCheckers.java
@@ -21,6 +21,7 @@
 import static com.google.errorprone.matchers.Description.NO_MATCH;
 import static com.google.errorprone.util.ASTHelpers.getSymbol;
 import static com.google.errorprone.util.ASTHelpers.getType;
+import static com.google.errorprone.util.ASTHelpers.hasAnnotation;
 import static com.google.errorprone.util.ASTHelpers.hasDirectAnnotationWithSimpleName;
 import static com.google.errorprone.util.ASTHelpers.isGeneratedConstructor;
 import static com.google.errorprone.util.ASTHelpers.isSubtype;
@@ -49,7 +50,8 @@ public Description matchMethod(MethodTree tree, VisitorState state) {
       return NO_MATCH;
     }
     if (!isSubtype(
-        symbol.owner.type, state.getTypeFromString(BugChecker.class.getCanonicalName()), state)) {
+            symbol.owner.type, state.getTypeFromString(BugChecker.class.getCanonicalName()), state)
+        || !hasAnnotation(symbol.owner, BugPattern.class, state)) {
       return NO_MATCH;
     }
     if (tree.getParameters().isEmpty()

diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/InjectOnBugCheckersTest.java b/core/src/test/java/com/google/errorprone/bugpatterns/InjectOnBugCheckersTest.java
@@ -31,21 +31,38 @@ public void positive() {
     compilationTestHelper
         .addSourceLines(
             "Test.java",
+            "import com.google.errorprone.BugPattern;",
             "import com.google.errorprone.ErrorProneFlags;",
             "import com.google.errorprone.bugpatterns.BugChecker;",
+            "@BugPattern(summary = \"\", severity = BugPattern.SeverityLevel.WARNING)",
             "public class Test extends BugChecker {",
             "  // BUG: Diagnostic contains: @Inject",
             "  public Test(ErrorProneFlags f) {}",
             "}")
         .doTest();
   }
 
+  @Test
+  public void notTheActualBugPattern_noFinding() {
+    compilationTestHelper
+        .addSourceLines(
+            "Test.java",
+            "import com.google.errorprone.ErrorProneFlags;",
+            "import com.google.errorprone.bugpatterns.BugChecker;",
+            "public class Test extends BugChecker {",
+            "  public Test(ErrorProneFlags f) {}",
+            "}")
+        .doTest();
+  }
+
   @Test
   public void zeroArgConstructor_noFinding() {
     compilationTestHelper
         .addSourceLines(
             "Test.java",
+            "import com.google.errorprone.BugPattern;",
             "import com.google.errorprone.bugpatterns.BugChecker;",
+            "@BugPattern(summary = \"\", severity = BugPattern.SeverityLevel.WARNING)",
             "public class Test extends BugChecker {",
             "  public Test() {}",
             "}")
@@ -57,9 +74,11 @@ public void alreadyAnnotated_noFinding() {
     compilationTestHelper
         .addSourceLines(
             "Test.java",
+            "import com.google.errorprone.BugPattern;",
             "import com.google.errorprone.ErrorProneFlags;",
             "import com.google.errorprone.bugpatterns.BugChecker;",
             "import javax.inject.Inject;",
+            "@BugPattern(summary = \"\", severity = BugPattern.SeverityLevel.WARNING)",
             "public class Test extends BugChecker {",
             "  @Inject",
             "  public Test(ErrorProneFlags f) {}",