Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-08 17:19:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #153124 from microsoft/3wm

Browse Source
This commit is contained in:
Henning Dieterichs
2022-06-24 16:25:25 +02:00
committed by GitHub
parent dfe0de8cd9 059934482c
commit c4c1c01727
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel.ts
+7 -1
View File
@@ -411,7 +411,13 @@ function editsToLineRangeEdit(range: LineRange, sortedEdits: RangeEdit[], textMo
if (!currentPosition.isBeforeOrEqual(diffStart)) {
return undefined;
}
const originalText = textModel.getValueInRange(Range.fromPositions(currentPosition, diffStart));
let originalText = textModel.getValueInRange(Range.fromPositions(currentPosition, diffStart));
if (diffStart.lineNumber > textModel.getLineCount()) {
// assert diffStart.lineNumber === textModel.getLineCount() + 1
// getValueInRange doesn't include this virtual line break, as the document ends the line before.
// endsLineAfter will be false.
originalText += '\n';
}
text += originalText;
text += edit.newText;
currentPosition = edit.range.getEndPosition();