Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes Diff Algorithm Bug #187638

Merged
merged 1 commit into from
Jul 12, 2023
Merged

Fixes Diff Algorithm Bug #187638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/vs/editor/common/diff/algorithms/joinSequenceDiffs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,16 @@ export function smoothenSequenceDiffs(sequence1: ISequence, sequence2: ISequence
* Improved diff: [{Add ", Foo" after Bar}]
*/
export function joinSequenceDiffs(sequence1: ISequence, sequence2: ISequence, sequenceDiffs: SequenceDiff[]): SequenceDiff[] {
const result: SequenceDiff[] = [];
if (sequenceDiffs.length > 0) {
result.push(sequenceDiffs[0]);
if (sequenceDiffs.length === 0) {
return sequenceDiffs;
}

const result: SequenceDiff[] = [];
result.push(sequenceDiffs[0]);

// First move them all to the left as much as possible and join them if possible
for (let i = 1; i < sequenceDiffs.length; i++) {
const prevResult = sequenceDiffs[i - 1];
const prevResult = result[result.length - 1];
let cur = sequenceDiffs[i];

if (cur.seq1Range.isEmpty || cur.seq2Range.isEmpty) {
Expand Down
5 changes: 3 additions & 2 deletions src/vs/editor/test/node/diffing/diffingFixture.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ suite('diff fixtures', () => {

const diffingAlgo = diffingAlgoName === 'legacy' ? new SmartLinesDiffComputer() : new StandardLinesDiffComputer();

const diff = diffingAlgo.computeDiff(firstContentLines, secondContentLines, { ignoreTrimWhitespace: false, maxComputationTimeMs: Number.MAX_SAFE_INTEGER, computeMoves: false });
const ignoreTrimWhitespace = folder.indexOf('trimws') >= 0;
const diff = diffingAlgo.computeDiff(firstContentLines, secondContentLines, { ignoreTrimWhitespace, maxComputationTimeMs: Number.MAX_SAFE_INTEGER, computeMoves: false });

function getDiffs(changes: readonly LineRangeMapping[]): IDetailedDiff[] {
return changes.map<IDetailedDiff>(c => ({
Expand Down Expand Up @@ -112,7 +113,7 @@ suite('diff fixtures', () => {
}

test(`test`, () => {
runTest('issue-185779', 'advanced');
runTest('invalid-diff-trimws', 'advanced');
});

for (const folder of folders) {
Expand Down