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
9 changes: 9 additions & 0 deletions src/common/positions.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,5 +59,14 @@ describe('Range', () => {
const mergedRanges = Range.simplify([range1, range2, range3, range4]);
expect(mergedRanges.join(', ')).to.equal('Range[0:0 -> 0:5], Range[0:6 -> 0:7]');
});

it('should keep the outer range when merging contained ranges', () => {
const range1 = new Range(new Base0Position(0, 0), new Base0Position(0, 10));
const range2 = new Range(new Base0Position(0, 2), new Base0Position(0, 5));
const range3 = new Range(new Base0Position(0, 7), new Base0Position(0, 8));
const range4 = new Range(new Base0Position(0, 0), new Base0Position(0, 3));
const mergedRanges = Range.simplify([range1, range2, range3, range4]);
expect(mergedRanges.join(', ')).to.equal('Range[0:0 -> 0:10]');
});
});
});
4 changes: 3 additions & 1 deletion src/common/positions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,9 @@ export class Range {
for (let i = 1; i < sortedRanges.length; i++) {
const nextRange = sortedRanges[i];
if (currentRange.end.compare(nextRange.begin) >= 0) {
currentRange = new Range(currentRange.begin, nextRange.end);
if (nextRange.end.compare(currentRange.end) > 0) {
currentRange = new Range(currentRange.begin, nextRange.end);
}
} else {
mergedRanges.push(currentRange);
currentRange = nextRange;
Expand Down
Loading