Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-20 02:08:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #193367

Browse Source
This commit is contained in:
Henning Dieterichs
2023-09-25 12:54:50 +02:00
committed by Henning Dieterichs
parent bfb541540f
commit 79a3ef5a7d
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/vs/editor/common/diff/defaultLinesDiffComputer/computeMovedLines.ts
View File

@@ -307,14 +307,12 @@ function joinCloseConsecutiveMoves(moves: LineRangeMapping[]): LineRangeMapping[
function removeMovesInSameDiff(changes: DetailedLineRangeMapping[], moves: LineRangeMapping[]) { function removeMovesInSameDiff(changes: DetailedLineRangeMapping[], moves: LineRangeMapping[]) {
const changesMonotonous = new MonotonousArray(changes); const changesMonotonous = new MonotonousArray(changes);
moves = moves.filter(m => { moves = moves.filter(m => {
const diffBeforeOriginalMove = changesMonotonous.findLastMonotonous(c => c.original.endLineNumberExclusive <= m.original.startLineNumber) const diffBeforeEndOfMoveOriginal = changesMonotonous.findLastMonotonous(c => c.original.endLineNumberExclusive < m.original.endLineNumberExclusive)
|| new LineRangeMapping(new LineRange(1, 1), new LineRange(1, 1)); || new LineRangeMapping(new LineRange(1, 1), new LineRange(1, 1));
const diffBeforeEndOfMoveModified = findLastMonotonous(changes, c => c.modified.endLineNumberExclusive < m.modified.endLineNumberExclusive);
const modifiedDistToPrevDiff = m.modified.startLineNumber - diffBeforeOriginalMove.modified.endLineNumberExclusive; const differentDiffs = diffBeforeEndOfMoveOriginal !== diffBeforeEndOfMoveModified;
const originalDistToPrevDiff = m.original.startLineNumber - diffBeforeOriginalMove.original.endLineNumberExclusive; return differentDiffs;
const differentDistances = modifiedDistToPrevDiff !== originalDistToPrevDiff;
return differentDistances;
}); });
return moves; return moves;
} }