development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-07-17 11:07:22 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge pull request #184165 from microsoft/hediet/b/line-range-bug-fix

Browse source 
Fixes line range mapping construction bug.
This commit is contained in:
Henning Dieterichs 2023-06-02 16:13:43 +02:00 committed by GitHub
parent 80deac05cf ec278082f8
commit 6d45c3610a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/vs/editor/common/diff/standardLinesDiffComputer.ts
View file

@ -280,19 +280,23 @@ export function getLineRangeMapping(rangeMapping: RangeMapping, originalLines: s
// rangeMapping describes the edit that replaces `rangeMapping.originalRange` with `newText := getText(modifiedLines, rangeMapping.modifiedRange)`.
// original: xxx[ \n <- this line is not modified
// modified: xxx[ \n
if (rangeMapping.modifiedRange.startColumn - 1 >= modifiedLines[rangeMapping.modifiedRange.startLineNumber - 1].length
&& rangeMapping.originalRange.startColumn - 1 >= originalLines[rangeMapping.originalRange.startLineNumber - 1].length) {
lineStartDelta = 1; // +1 is always possible, as startLineNumber < endLineNumber + 1
}
// original: ]xxx \n <- this line is not modified
// modified: ]xx \n
if (rangeMapping.modifiedRange.endColumn === 1 && rangeMapping.originalRange.endColumn === 1
&& rangeMapping.originalRange.startLineNumber + lineStartDelta <= rangeMapping.originalRange.endLineNumber
&& rangeMapping.modifiedRange.startLineNumber + lineStartDelta <= rangeMapping.modifiedRange.endLineNumber) {
lineEndDelta = -1; // We can only do this if the range is not empty yet
// We can only do this if the range is not empty yet
lineEndDelta = -1;
}
// original: xxx[ \n <- this line is not modified
// modified: xxx[ \n
if (rangeMapping.modifiedRange.startColumn - 1 >= modifiedLines[rangeMapping.modifiedRange.startLineNumber - 1].length
&& rangeMapping.originalRange.startColumn - 1 >= originalLines[rangeMapping.originalRange.startLineNumber - 1].length
&& rangeMapping.originalRange.startLineNumber <= rangeMapping.originalRange.endLineNumber + lineEndDelta
&& rangeMapping.modifiedRange.startLineNumber <= rangeMapping.modifiedRange.endLineNumber + lineEndDelta) {
// We can only do this if the range is not empty yet
lineStartDelta = 1;
}
const originalLineRange = new LineRange(

27
src/vs/editor/test/node/diffing/lineRangeMapping.test.ts
View file

@ -9,8 +9,7 @@ import { RangeMapping } from 'vs/editor/common/diff/linesDiffComputer';
import { getLineRangeMapping } from 'vs/editor/common/diff/standardLinesDiffComputer';
suite('lineRangeMapping', () => {
test('lineRangeMapping', () => {
// {[2,1 -> 3,1]->[2,1 -> 2,1]}
test('1', () => {
assert.deepStrictEqual(
getLineRangeMapping(
new RangeMapping(
@ -27,7 +26,29 @@ suite('lineRangeMapping', () => {
''
]
).toString(),
"{[3,4)->[3,3)}"
"{[2,3)->[2,2)}"
);
});
test('2', () => {
assert.deepStrictEqual(
getLineRangeMapping(
new RangeMapping(
new Range(2, 1, 2, 1),
new Range(2, 1, 4, 1),
),
[
'',
'',
],
[
'',
'',
'',
'',
]
).toString(),
"{[2,2)->[2,4)}"
);
});
});