Fix consistency of isCovered() in CheckReturnValue

nick-someone · Error Prone Team · commit fba919bb786e · 2022-04-04T13:10:34.000-07:00
PiperOrigin-RevId: 439392998
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/CheckReturnValue.java b/core/src/main/java/com/google/errorprone/bugpatterns/CheckReturnValue.java
@@ -110,7 +110,9 @@ private static Optional<MethodSymbol> methodSymbol(ExpressionTree tree) {
 
   @Override
   public boolean isCovered(ExpressionTree tree, VisitorState state) {
-    return methodSymbol(tree).flatMap(CheckReturnValue::firstAnnotation).isPresent();
+    return methodSymbol(tree)
+        .map(m -> (checkAllConstructors && m.isConstructor()) || firstAnnotation(m).isPresent())
+        .orElse(false);
   }
 
   @Override

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,9 @@ private static Optional<MethodSymbol> methodSymbol(ExpressionTree tree) {`
`110`	`110`
`111`	`111`	`@Override`
`112`	`112`	`public boolean isCovered(ExpressionTree tree, VisitorState state) {`
`113`		`- return methodSymbol(tree).flatMap(CheckReturnValue::firstAnnotation).isPresent();`
	`113`	`+ return methodSymbol(tree)`
	`114`	`+ .map(m -> (checkAllConstructors && m.isConstructor()) \|\| firstAnnotation(m).isPresent())`
	`115`	`+ .orElse(false);`
`114`	`116`	`}`
`115`	`117`
`116`	`118`	`@Override`