Skip to content

Commit 7943f8d

Browse files
authored
1 parent 980c60b commit 7943f8d

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

src/vs/editor/common/diff/algorithms/joinSequenceDiffs.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,11 @@ export function smoothenSequenceDiffs(sequence1: ISequence, sequence2: ISequence
3333
return result;
3434
}
3535

36-
export function randomRandomMatches(sequence1: LinesSliceCharSequence, sequence2: LinesSliceCharSequence, sequenceDiffs: SequenceDiff[]): SequenceDiff[] {
36+
export function removeRandomMatches(sequence1: LinesSliceCharSequence, sequence2: LinesSliceCharSequence, sequenceDiffs: SequenceDiff[]): SequenceDiff[] {
3737
let diffs = sequenceDiffs;
38+
if (diffs.length === 0) {
39+
return diffs;
40+
}
3841

3942
let counter = 0;
4043
let shouldRepeat: boolean;

src/vs/editor/common/diff/standardLinesDiffComputer.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { Position } from 'vs/editor/common/core/position';
1111
import { Range } from 'vs/editor/common/core/range';
1212
import { DateTimeout, ISequence, ITimeout, InfiniteTimeout, SequenceDiff } from 'vs/editor/common/diff/algorithms/diffAlgorithm';
1313
import { DynamicProgrammingDiffing } from 'vs/editor/common/diff/algorithms/dynamicProgrammingDiffing';
14-
import { optimizeSequenceDiffs, randomRandomMatches, smoothenSequenceDiffs } from 'vs/editor/common/diff/algorithms/joinSequenceDiffs';
14+
import { optimizeSequenceDiffs, removeRandomMatches, smoothenSequenceDiffs } from 'vs/editor/common/diff/algorithms/joinSequenceDiffs';
1515
import { MyersDiffAlgorithm } from 'vs/editor/common/diff/algorithms/myersDiffAlgorithm';
1616
import { ILinesDiffComputer, ILinesDiffComputerOptions, LineRangeMapping, LinesDiff, MovedText, RangeMapping, SimpleLineRangeMapping } from 'vs/editor/common/diff/linesDiffComputer';
1717

@@ -213,7 +213,7 @@ export class StandardLinesDiffComputer implements ILinesDiffComputer {
213213
diffs = optimizeSequenceDiffs(slice1, slice2, diffs);
214214
diffs = coverFullWords(slice1, slice2, diffs);
215215
diffs = smoothenSequenceDiffs(slice1, slice2, diffs);
216-
diffs = randomRandomMatches(slice1, slice2, diffs);
216+
diffs = removeRandomMatches(slice1, slice2, diffs);
217217

218218
const result = diffs.map(
219219
(d) =>

0 commit comments

Comments
 (0)