Skip to content

Commit d7d40a4

Browse files
cushonError Prone Team
authored andcommitted
Mention the annotation name in UnnecessaryQualifier
PiperOrigin-RevId: 878979262
1 parent 376bc7b commit d7d40a4

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

core/src/main/java/com/google/errorprone/bugpatterns/UnnecessaryQualifier.java

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import static com.google.errorprone.util.ASTHelpers.hasExplicitSource;
3333
import static com.google.errorprone.util.ASTHelpers.isRecord;
3434
import static com.google.errorprone.util.ASTHelpers.isSubtype;
35+
import static java.util.stream.Collectors.joining;
3536

3637
import com.google.common.collect.ImmutableList;
3738
import com.google.common.collect.ImmutableSet;
@@ -176,9 +177,18 @@ private Description deleteAnnotations(
176177
if (explicitAnnotations.isEmpty()) {
177178
return NO_MATCH;
178179
}
179-
return describeMatch(
180-
explicitAnnotations.getFirst(),
181-
explicitAnnotations.stream().map(SuggestedFix::delete).collect(mergeFixes()));
180+
boolean plural = explicitAnnotations.size() > 1;
181+
return buildDescription(explicitAnnotations.getFirst())
182+
.addFix(explicitAnnotations.stream().map(SuggestedFix::delete).collect(mergeFixes()))
183+
.setMessage(
184+
String.format(
185+
"Qualifier annotation%s %s %s no effect here",
186+
plural ? "s" : "",
187+
explicitAnnotations.stream()
188+
.map(anno -> getSymbol(anno).getQualifiedName().toString())
189+
.collect(joining(", ", "@", "")),
190+
plural ? "have" : "has"))
191+
.build();
182192
}
183193

184194
private static ImmutableList<AnnotationTree> getQualifiers(

core/src/test/java/com/google/errorprone/bugpatterns/UnnecessaryQualifierTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public void unannotatedField() {
5757
"Test.java",
5858
"""
5959
class Test {
60-
// BUG: Diagnostic contains:
60+
// BUG: Diagnostic contains: Qualifier annotation @Qual has no effect here
6161
@Qual int x;
6262
}
6363
""")

0 commit comments

Comments
 (0)