Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-09-25 17:27:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes end-of-document line change bug.

Browse Source
This commit is contained in:
Henning Dieterichs
2022-05-30 15:10:17 +02:00
parent 30aa8cc0fb
commit 5b9978cc67
1 changed files with 34 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/contrib/mergeEditor/browser/model.ts
+34 -14
View File
@@ -9,6 +9,10 @@ import { Range } from 'vs/editor/common/core/range';
import { ILineChange } from 'vs/editor/common/diff/diffComputer';
import { ITextModel } from 'vs/editor/common/model';
/**
* Represents an edit, expressed in whole lines:
* At {@link LineRange.startLineNumber}, delete {@link LineRange.lineCount} many lines and insert {@link newLines}.
*/
export class LineEdit {
constructor(
public readonly range: LineRange,
@@ -30,10 +34,26 @@ export class LineEdits {
public apply(model: ITextModel): void {
model.pushEditOperations(
null,
this.edits.map((e) => ({
range: new Range(e.range.startLineNumber, 1, e.range.endLineNumberExclusive, 1),
text: e.newLines.map(l => l + '\n').join(''),
})),
this.edits.map((e) => {
if (e.range.endLineNumberExclusive <= model.getLineCount()) {
return {
range: new Range(e.range.startLineNumber, 1, e.range.endLineNumberExclusive, 1),
text: e.newLines.map(s => s + '\n').join(''),
};
}
if (e.range.startLineNumber === 1) {
return {
range: new Range(1, 1, model.getLineCount(), Number.MAX_SAFE_INTEGER),
text: e.newLines.join('\n'),
};
}
return {
range: new Range(e.range.startLineNumber - 1, Number.MAX_SAFE_INTEGER, model.getLineCount(), Number.MAX_SAFE_INTEGER),
text: e.newLines.map(s => '\n' + s).join(''),
};
}),
() => null
);
}
@@ -110,6 +130,14 @@ export class LineRange {
public deltaEnd(delta: number): LineRange {
return new LineRange(this.startLineNumber, this.lineCount + delta);
}
public getLines(model: ITextModel): string[] {
const result = new Array(this.lineCount);
for (let i = 0; i < this.lineCount; i++) {
result[i] = model.getLineContent(this.startLineNumber + i);
}
return result;
}
}
export class LineDiff {
@@ -215,19 +243,11 @@ export class LineDiff {
}
private getModifiedLines(): string[] {
const result = new Array(this.modifiedRange.lineCount);
for (let i = 0; i < this.modifiedRange.lineCount; i++) {
result[i] = this.modifiedTextModel.getLineContent(this.modifiedRange.startLineNumber + i);
}
return result;
return this.modifiedRange.getLines(this.modifiedTextModel);
}
private getOriginalLines(): string[] {
const result = new Array(this.originalRange.lineCount);
for (let i = 0; i < this.originalRange.lineCount; i++) {
result[i] = this.originalTextModel.getLineContent(this.originalRange.startLineNumber + i);
}
return result;
return this.originalRange.getLines(this.originalTextModel);
}
}