UnusedVariable: flag parameters in _effectively_ private methods, not…

… just private methods. PiperOrigin-RevId: 584277317
google · Nov 21, 2023 · 88a224c · 88a224c
1 parent 6a23848
commit 88a224c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/UnusedVariable.java b/core/src/main/java/com/google/errorprone/bugpatterns/UnusedVariable.java
@@ -686,18 +686,21 @@ private boolean isParameterSubjectToAnalysis(Symbol sym) {
       checkArgument(sym.getKind() == ElementKind.PARAMETER);
       Symbol enclosingMethod = sym.owner;
 
-      for (String annotationName : methodAnnotationsExemptingParameters) {
-        if (hasAnnotation(enclosingMethod, annotationName, state)) {
-          return false;
-        }
+      if (!(enclosingMethod instanceof MethodSymbol)) {
+        return false;
+      }
+
+      if (methodAnnotationsExemptingParameters.stream()
+          .anyMatch(anno -> hasAnnotation(enclosingMethod, anno, state))) {
+        return false;
       }
 
       if (ANNOTATIONS_INDICATING_PARAMETERS_SHOULD_BE_CHECKED.stream()
           .anyMatch(a -> hasAnnotation(enclosingMethod, a, state))) {
         return true;
       }
 
-      return enclosingMethod.getModifiers().contains(Modifier.PRIVATE);
+      return canBeRemoved(enclosingMethod, state);
     }
 
     @Override

diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/UnusedVariableTest.java b/core/src/test/java/com/google/errorprone/bugpatterns/UnusedVariableTest.java
@@ -257,6 +257,12 @@ public void unusedParamInPrivateMethod() {
             "  private void test(int i, int j) {",
             "    System.out.println(i);",
             "  }",
+            "  private class Inner {",
+            "    // BUG: Diagnostic contains: 'j' is never read",
+            "    public void test(int i, int j) {",
+            "      System.out.println(i);",
+            "    }",
+            "  }",
             "  public void main() {",
             "    test(1, 2);",
             "  }",