Skip to content
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

Jump to bottom

Fixes https://github.com/microsoft/vscode-internalbacklog/issues/4528 #189631

Merged
merged 1 commit into from
Aug 4, 2023
Merged

Fixes https://github.com/microsoft/vscode-internalbacklog/issues/4528 #189631

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
31 changes: 31 additions & 0 deletions src/vs/workbench/contrib/mergeEditor/browser/model/diffComputer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,37 @@ export class MergeDiffComputer implements IMergeDiffComputer {
);

assertFn(() => {
for (const c of changes) {
const inputRange = c.inputRange;
const outputRange = c.outputRange;
const inputTextModel = c.inputTextModel;
const outputTextModel = c.outputTextModel;

for (const map of c.rangeMappings) {
let inputRangesValid = inputRange.startLineNumber - 1 <= map.inputRange.startLineNumber
&& map.inputRange.endLineNumber <= inputRange.endLineNumberExclusive;
if (inputRangesValid && map.inputRange.startLineNumber === inputRange.startLineNumber - 1) {
inputRangesValid = map.inputRange.endColumn >= inputTextModel.getLineMaxColumn(map.inputRange.startLineNumber);
}
if (inputRangesValid && map.inputRange.endLineNumber === inputRange.endLineNumberExclusive) {
inputRangesValid = map.inputRange.endColumn === 1;
}

let outputRangesValid = outputRange.startLineNumber - 1 <= map.outputRange.startLineNumber
&& map.outputRange.endLineNumber <= outputRange.endLineNumberExclusive;
if (outputRangesValid && map.outputRange.startLineNumber === outputRange.startLineNumber - 1) {
outputRangesValid = map.outputRange.endColumn >= outputTextModel.getLineMaxColumn(map.outputRange.endLineNumber);
}
if (outputRangesValid && map.outputRange.endLineNumber === outputRange.endLineNumberExclusive) {
outputRangesValid = map.outputRange.endColumn === 1;
}

if (!inputRangesValid || !outputRangesValid) {
return false;
}
}
}

return changes.length === 0 || (changes[0].inputRange.startLineNumber === changes[0].outputRange.startLineNumber &&
checkAdjacentItems(changes,
(m1, m2) => m2.inputRange.startLineNumber - m1.inputRange.endLineNumberExclusive === m2.outputRange.startLineNumber - m1.outputRange.endLineNumberExclusive &&
Expand Down
27 changes: 0 additions & 27 deletions src/vs/workbench/contrib/mergeEditor/browser/model/mapping.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,33 +237,6 @@ export class DetailedLineRangeMapping extends LineRangeMapping {
super(inputRange, outputRange);

this.rangeMappings = rangeMappings || [new RangeMapping(this.inputRange.toRange(), this.outputRange.toRange())];

assertFn(() => {
for (const map of this.rangeMappings) {
let inputRangesValid = inputRange.startLineNumber - 1 <= map.inputRange.startLineNumber
&& map.inputRange.endLineNumber <= inputRange.endLineNumberExclusive;
if (inputRangesValid && map.inputRange.startLineNumber === inputRange.startLineNumber - 1) {
inputRangesValid = map.inputRange.endColumn >= inputTextModel.getLineMaxColumn(map.inputRange.startLineNumber);
}
if (inputRangesValid && map.inputRange.endLineNumber === inputRange.endLineNumberExclusive) {
inputRangesValid = map.inputRange.endColumn === 1;
}

let outputRangesValid = outputRange.startLineNumber - 1 <= map.outputRange.startLineNumber
&& map.outputRange.endLineNumber <= outputRange.endLineNumberExclusive;
if (outputRangesValid && map.outputRange.startLineNumber === outputRange.startLineNumber - 1) {
outputRangesValid = map.outputRange.endColumn >= outputTextModel.getLineMaxColumn(map.outputRange.startLineNumber);
}
if (outputRangesValid && map.outputRange.endLineNumber === outputRange.endLineNumberExclusive) {
outputRangesValid = map.outputRange.endColumn === 1;
}

if (!inputRangesValid || !outputRangesValid) {
return false;
}
}
return true;
});
}

public override addOutputLineDelta(delta: number): DetailedLineRangeMapping {
Expand Down