[merge addon] Fix bug in chunk-aligning algorithm

marijnh · marijnh · commit 5105da7fcd5a · 2016-11-01T11:04:58.000+01:00
Closes codemirror#4353
diff --git a/addon/merge/merge.js b/addon/merge/merge.js
@@ -343,11 +343,12 @@
             j = -1;
             break;
           } else if (align[1] > chunk.editTo) {
+            j--
             break;
           }
         }
         if (j > -1)
-          linesToAlign.splice(j - 1, 0, [getMatchingOrigLine(chunk.editTo, dv.chunks), chunk.editTo, chunk.origTo]);
+          linesToAlign.splice(j, 0, [getMatchingOrigLine(chunk.editTo, dv.chunks), chunk.editTo, chunk.origTo]);
       }
     }
     return linesToAlign;

Original file line number	Diff line number	Diff line change
`@@ -343,11 +343,12 @@`
`343`	`343`	`j = -1;`
`344`	`344`	`break;`
`345`	`345`	`} else if (align[1] > chunk.editTo) {`
	`346`	`+ j--`
`346`	`347`	`break;`
`347`	`348`	`}`
`348`	`349`	`}`
`349`	`350`	`if (j > -1)`
`350`		`- linesToAlign.splice(j - 1, 0, [getMatchingOrigLine(chunk.editTo, dv.chunks), chunk.editTo, chunk.origTo]);`
	`351`	`+ linesToAlign.splice(j, 0, [getMatchingOrigLine(chunk.editTo, dv.chunks), chunk.editTo, chunk.origTo]);`
`351`	`352`	`}`
`352`	`353`	`}`
`353`	`354`	`return linesToAlign;`