Skip to content

fix: intersect ranges using only the boundary lines own characters #13146

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

Open
tonycoder-hub wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: intersect ranges using only the boundary lines own characters #13146

Show file tree
Hide file tree
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
39 changes: 37 additions & 2 deletions core/util/ranges.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,8 +301,7 @@ describe("intersection", () => {
expect(result).toBeNull();
});

// TODO
test.skip("returns correct intersection for single line overlap", () => {
test("returns correct intersection for single line overlap", () => {
rangeA = {
start: { line: 1, character: 0 },
end: { line: 1, character: 5 },
Expand All @@ -320,6 +319,42 @@ describe("intersection", () => {
});
});

test("returns correct intersection when both ranges start on the first line", () => {
rangeA = {
start: { line: 1, character: 0 },
end: { line: 5, character: 0 },
};

rangeB = {
start: { line: 1, character: 7 },
end: { line: 3, character: 2 },
};

const result = intersection(rangeA, rangeB);
expect(result).toEqual({
start: { line: 1, character: 7 },
end: { line: 3, character: 2 },
});
});

test("returns correct intersection when both ranges end on the last line", () => {
rangeA = {
start: { line: 1, character: 0 },
end: { line: 3, character: 8 },
};

rangeB = {
start: { line: 2, character: 0 },
end: { line: 3, character: 4 },
};

const result = intersection(rangeA, rangeB);
expect(result).toEqual({
start: { line: 2, character: 0 },
end: { line: 3, character: 4 },
});
});

test("returns null for single line non-overlapping ranges", () => {
rangeA = {
start: { line: 1, character: 0 },
Expand Down
32 changes: 15 additions & 17 deletions core/util/ranges.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,25 +32,23 @@ export function intersection(a: Range, b: Range): Range | null {
return null;
}

if (startLine === endLine) {
const startCharacter = Math.max(a.start.character, b.start.character);
const endCharacter = Math.min(a.end.character, b.end.character);

if (startCharacter > endCharacter) {
return null;
}

return {
start: { line: startLine, character: startCharacter },
end: { line: endLine, character: endCharacter },
};
// A range only constrains the characters of the boundary line if it actually
// starts/ends there - otherwise it spans the whole line.
const startCharacter = Math.max(
...[a.start, b.start]
.filter((position) => position.line === startLine)
.map((position) => position.character),
);
const endCharacter = Math.min(
...[a.end, b.end]
.filter((position) => position.line === endLine)
.map((position) => position.character),
);

if (startLine === endLine && startCharacter > endCharacter) {
return null;
}

const startCharacter =
startLine === a.start.line ? a.start.character : b.start.character;
const endCharacter =
endLine === a.end.line ? a.end.character : b.end.character;

return {
start: { line: startLine, character: startCharacter },
end: { line: endLine, character: endCharacter },
Expand Down
Loading