Suppress MethodCanBeStatic with @keep (including as a meta-annotation)

PiperOrigin-RevId: 438543791
google · Mar 31, 2022 · d8961c2 · d8961c2
1 parent 62a2d27
commit d8961c2
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/MethodCanBeStatic.java b/core/src/main/java/com/google/errorprone/bugpatterns/MethodCanBeStatic.java
@@ -234,9 +234,7 @@ private static boolean isExcluded(MethodTree tree, VisitorState state) {
     if (sym.isConstructor() || !disjoint(EXCLUDED_MODIFIERS, sym.getModifiers())) {
       return true;
     }
-    if (!ASTHelpers.canBeRemoved(sym, state)) {
-      // Methods that override other methods, or that are overridden, can't be static.
-      // We conservatively warn only for private methods.
+    if (!ASTHelpers.canBeRemoved(sym, state) || ASTHelpers.shouldKeep(tree)) {
       return true;
     }
     switch (sym.owner.enclClass().getNestingKind()) {

diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/MethodCanBeStaticTest.java b/core/src/test/java/com/google/errorprone/bugpatterns/MethodCanBeStaticTest.java
@@ -179,6 +179,21 @@ public void positiveTypeParameter() {
         .doTest();
   }
 
+  @Test
+  public void negativeSuppressedByKeep() {
+    testHelper
+        .addSourceLines(
+            "Test.java",
+            "import com.google.errorprone.annotations.Keep;",
+            "class Test {",
+            "  @Keep",
+            "  private int add(int x, int y) {",
+            "    return x + y;",
+            "  }",
+            "}")
+        .doTest();
+  }
+
   @Test
   public void negativeTypeParameter() {
     testHelper