Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,12 @@
import static com.google.errorprone.matchers.Matchers.SERIALIZATION_METHODS;
import static com.google.errorprone.suppliers.Suppliers.typeFromString;
import static com.google.errorprone.util.ASTHelpers.canBeRemoved;
import static com.google.errorprone.util.ASTHelpers.getEnclosedElements;
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.isGeneratedConstructor;
import static com.google.errorprone.util.ASTHelpers.isRecord;
import static com.google.errorprone.util.ASTHelpers.isSubtype;
import static com.google.errorprone.util.MoreAnnotations.asStrings;
import static com.google.errorprone.util.MoreAnnotations.getAnnotationValue;
Expand All @@ -49,10 +51,12 @@
import com.google.errorprone.fixes.SuggestedFix;
import com.google.errorprone.matchers.Description;
import com.google.errorprone.suppliers.Supplier;
import com.google.errorprone.util.ASTHelpers;
import com.sun.source.tree.AnnotationTree;
import com.sun.source.tree.AssignmentTree;
import com.sun.source.tree.ClassTree;
import com.sun.source.tree.CompilationUnitTree;
import com.sun.source.tree.DeconstructionPatternTree;
import com.sun.source.tree.IdentifierTree;
import com.sun.source.tree.MemberReferenceTree;
import com.sun.source.tree.MemberSelectTree;
Expand Down Expand Up @@ -280,6 +284,25 @@ public Void visitAssignment(AssignmentTree tree, Void unused) {
return super.visitAssignment(tree, null);
}

@Override
public Void visitDeconstructionPattern(DeconstructionPatternTree tree, Void unused) {
var symbol = getSymbol(tree.getDeconstructor());
if (isRecord(symbol)) {
ImmutableSet<Name> componentNames =
getEnclosedElements(symbol).stream()
.filter(ASTHelpers::isRecord)
.map(Symbol::getSimpleName)
.collect(toImmutableSet());
for (Symbol e : getEnclosedElements(symbol)) {
if (componentNames.contains(e.getSimpleName())) {
handle(e);
}
}
}

return super.visitDeconstructionPattern(tree, null);
}

private void handle(Symbol symbol) {
if (symbol instanceof MethodSymbol) {
unusedMethods.remove(symbol);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -695,4 +695,47 @@ public void run() {}
""")
.doTest();
}

@Test
public void overriddenRecordGetter_isUsedByDestructuring() {
helper
.addSourceLines(
"Test.java",
"""
class Test {
private record R(int x, int y) {
@Override
public int x() {
return x;
}
}

int f(R r) {
return switch (r) {
case R(int x, int y) -> x;
default -> 0;
};
}
}
""")
.doTest();
}

@Test
public void otherOverriddenMethod_stillFlagged() {
helper
.addSourceLines(
"Test.java",
"""
class Test {
private record R(int x, int y) {
// BUG: Diagnostic contains:
public int frobnicator() {
return x;
}
}
}
""")
.doTest();
}
}
Loading