Skip to content

In the Contains matcher, return null when the input tree is null. #5934

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
copybara-service merged 1 commit into from
Jul 1, 2026
+6 −2
Merged

In the Contains matcher, return null when the input tree is null. #5934

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions check_api/src/main/java/com/google/errorprone/matchers/Contains.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import com.google.errorprone.VisitorState;
import com.sun.source.tree.Tree;
import com.sun.source.util.TreeScanner;
import org.jspecify.annotations.Nullable;

/**
* A matcher that recursively inspects a tree, applying the given matcher to all levels of each tree
Expand All @@ -42,8 +43,11 @@ public boolean matches(Tree tree, VisitorState state) {
private boolean matchFound = false;

@Override
public Void scan(Tree tree, Void unused) {
if (matchFound || matcher.matches(tree, state)) {
public Void scan(@Nullable Tree tree, Void unused) {
if (tree == null || matchFound) {
return null;
}
if (matcher.matches(tree, state)) {
matchFound = true;
return null;
}
Expand Down
Loading