[merge addon] Fix bug when merging a deletion at the bottom of the document

marijnh · marijnh · commit b5f9810307aa · 2016-02-02T16:06:30.000+01:00
Closes codemirror#3802
diff --git a/addon/merge/merge.css b/addon/merge/merge.css
@@ -60,6 +60,7 @@
   position: absolute;
   cursor: pointer;
   color: #44c;
+  z-index: 3;
 }
 
 .CodeMirror-merge-copy-reverse {
diff --git a/addon/merge/merge.js b/addon/merge/merge.js
@@ -427,8 +427,9 @@
 
   function copyChunk(dv, to, from, chunk) {
     if (dv.diffOutOfDate) return;
+    var start = chunk.editTo > to.lastLine() ? Pos(chunk.editFrom - 1) : Pos(chunk.editFrom, 0)
     to.replaceRange(from.getRange(Pos(chunk.origFrom, 0), Pos(chunk.origTo, 0)),
-                         Pos(chunk.editFrom, 0), Pos(chunk.editTo, 0));
+                    start, Pos(chunk.editTo, 0));
   }
 
   // Merge view, containing 0, 1, or 2 diff views.

Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,7 @@`
`60`	`60`	`position: absolute;`
`61`	`61`	`cursor: pointer;`
`62`	`62`	`color: #44c;`
	`63`	`+ z-index: 3;`
`63`	`64`	`}`
`64`	`65`
`65`	`66`	`.CodeMirror-merge-copy-reverse {`
Original file line number	Diff line number	Diff line change
`@@ -427,8 +427,9 @@`
`427`	`427`
`428`	`428`	`function copyChunk(dv, to, from, chunk) {`
`429`	`429`	`if (dv.diffOutOfDate) return;`
	`430`	`+ var start = chunk.editTo > to.lastLine() ? Pos(chunk.editFrom - 1) : Pos(chunk.editFrom, 0)`
`430`	`431`	`to.replaceRange(from.getRange(Pos(chunk.origFrom, 0), Pos(chunk.origTo, 0)),`
`431`		`- Pos(chunk.editFrom, 0), Pos(chunk.editTo, 0));`
	`432`	`+ start, Pos(chunk.editTo, 0));`
`432`	`433`	`}`
`433`	`434`
`434`	`435`	`// Merge view, containing 0, 1, or 2 diff views.`