Skip to content

Commit 2533218

Browse files
cushonError Prone Team
authored andcommitted
Handle overlapping ranges in suppressedRegions
#4040 PiperOrigin-RevId: 553911083
1 parent 449e6f4 commit 2533218

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

check_api/src/main/java/com/google/errorprone/bugpatterns/BugChecker.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import com.google.common.collect.ImmutableRangeSet;
2525
import com.google.common.collect.Iterables;
2626
import com.google.common.collect.Range;
27+
import com.google.common.collect.TreeRangeSet;
2728
import com.google.errorprone.BugCheckerInfo;
2829
import com.google.errorprone.BugPattern.SeverityLevel;
2930
import com.google.errorprone.ErrorProneOptions;
@@ -306,7 +307,7 @@ public boolean isSuppressed(Symbol sym, VisitorState state) {
306307

307308
/** Computes a RangeSet of code regions which are suppressed by this bug checker. */
308309
public ImmutableRangeSet<Integer> suppressedRegions(VisitorState state) {
309-
ImmutableRangeSet.Builder<Integer> suppressedRegions = ImmutableRangeSet.builder();
310+
TreeRangeSet<Integer> suppressedRegions = TreeRangeSet.create();
310311
new TreeScanner<Void, Void>() {
311312
@Override
312313
public Void scan(Tree tree, Void unused) {
@@ -318,7 +319,7 @@ public Void scan(Tree tree, Void unused) {
318319
return null;
319320
}
320321
}.scan(state.getPath().getCompilationUnit(), null);
321-
return suppressedRegions.build();
322+
return ImmutableRangeSet.copyOf(suppressedRegions);
322323
}
323324

324325
public interface AnnotationTreeMatcher extends Suppressible {

0 commit comments

Comments
 (0)