Skip to content

adopt changes from core to ensure disjoint edits #3281

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
ulugbekna merged 1 commit into from
Jan 29, 2026
Merged

adopt changes from core to ensure disjoint edits #3281

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
31 changes: 23 additions & 8 deletions src/util/vs/editor/common/core/edits/stringEdit.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ export abstract class BaseStringEdit<T extends BaseStringReplacement<T> = BaseSt
let baseIdx = 0;
let ourIdx = 0;
let offset = 0;
let lastEndEx = -1; // Track end of last added edit to ensure sorted/disjoint invariant

while (ourIdx < this.replacements.length || baseIdx < base.replacements.length) {
// take the edit that starts first
Expand All @@ -110,10 +111,17 @@ export abstract class BaseStringEdit<T extends BaseStringReplacement<T> = BaseSt
break;
} else if (!baseEdit) {
// no more edits from base
newEdits.push(new StringReplacement(
ourEdit.replaceRange.delta(offset),
ourEdit.newText
));
const transformedRange = ourEdit.replaceRange.delta(offset);
// Check if the transformed edit would violate the sorted/disjoint invariant
if (transformedRange.start < lastEndEx) {
if (noOverlap) {
return undefined;
}
ourIdx++; // Skip this edit as it conflicts with a previously added edit
continue;
}
newEdits.push(new StringReplacement(transformedRange, ourEdit.newText));
lastEndEx = transformedRange.endExclusive;
ourIdx++;
} else if (ourEdit.replaceRange.intersects(baseEdit.replaceRange) || areConcurrentInserts(ourEdit.replaceRange, baseEdit.replaceRange)) {
ourIdx++; // Don't take our edit, as it is conflicting -> skip
Expand All @@ -122,10 +130,17 @@ export abstract class BaseStringEdit<T extends BaseStringReplacement<T> = BaseSt
}
} else if (ourEdit.replaceRange.start < baseEdit.replaceRange.start) {
// Our edit starts first
newEdits.push(new StringReplacement(
ourEdit.replaceRange.delta(offset),
ourEdit.newText
));
const transformedRange = ourEdit.replaceRange.delta(offset);
// Check if the transformed edit would violate the sorted/disjoint invariant
if (transformedRange.start < lastEndEx) {
if (noOverlap) {
return undefined;
}
ourIdx++; // Skip this edit as it conflicts with a previously added edit
continue;
}
newEdits.push(new StringReplacement(transformedRange, ourEdit.newText));
lastEndEx = transformedRange.endExclusive;
ourIdx++;
} else {
baseIdx++;
Expand Down
Loading