Skip to content

Commit 2683a6a

Browse files
authored
Fixes merge editor bug (microsoft#167113)
1 parent 0689d81 commit 2683a6a

File tree

5 files changed

+16
-2
lines changed

5 files changed

+16
-2
lines changed
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
hello
2+
world
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
hello
2+
world
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"originalFileName": "./1.txt",
3+
"modifiedFileName": "./2.txt",
4+
"diffs": []
5+
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"originalFileName": "./1.txt",
3+
"modifiedFileName": "./2.txt",
4+
"diffs": []
5+
}

src/vs/workbench/contrib/mergeEditor/browser/model/diffComputer.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@ export class MergeDiffComputer implements IMergeDiffComputer {
6363
);
6464

6565
assertFn(() => {
66-
return changes[0].inputRange.startLineNumber === changes[0].outputRange.startLineNumber &&
66+
return changes.length === 0 || (changes[0].inputRange.startLineNumber === changes[0].outputRange.startLineNumber &&
6767
checkAdjacentItems(changes,
6868
(m1, m2) => m2.inputRange.startLineNumber - m1.inputRange.endLineNumberExclusive === m2.outputRange.startLineNumber - m1.outputRange.endLineNumberExclusive &&
6969
// There has to be an unchanged line in between (otherwise both diffs should have been joined)
7070
m1.inputRange.endLineNumberExclusive < m2.inputRange.startLineNumber &&
7171
m1.outputRange.endLineNumberExclusive < m2.outputRange.startLineNumber,
72-
);
72+
));
7373
});
7474

7575
return {

0 commit comments

Comments
 (0)