[merge addon] Fix corner case in alignable-chunk sorting

marijnh · marijnh · commit 6d3a7457d1d9 · 2016-11-01T11:07:10.000+01:00
Issue codemirror#4353
diff --git a/addon/merge/merge.js b/addon/merge/merge.js
@@ -340,14 +340,14 @@
         for (var j = 0; j < linesToAlign.length; j++) {
           var align = linesToAlign[j];
           if (align[1] == chunk.editTo) {
-            j = -1;
+            j = -2;
             break;
           } else if (align[1] > chunk.editTo) {
             j--
             break;
           }
         }
-        if (j > -1)
+        if (j > -2)
           linesToAlign.splice(j, 0, [getMatchingOrigLine(chunk.editTo, dv.chunks), chunk.editTo, chunk.origTo]);
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -340,14 +340,14 @@`
`340`	`340`	`for (var j = 0; j < linesToAlign.length; j++) {`
`341`	`341`	`var align = linesToAlign[j];`
`342`	`342`	`if (align[1] == chunk.editTo) {`
`343`		`- j = -1;`
	`343`	`+ j = -2;`
`344`	`344`	`break;`
`345`	`345`	`} else if (align[1] > chunk.editTo) {`
`346`	`346`	`j--`
`347`	`347`	`break;`
`348`	`348`	`}`
`349`	`349`	`}`
`350`		`- if (j > -1)`
	`350`	`+ if (j > -2)`
`351`	`351`	`linesToAlign.splice(j, 0, [getMatchingOrigLine(chunk.editTo, dv.chunks), chunk.editTo, chunk.origTo]);`
`352`	`352`	`}`
`353`	`353`	`}`