fix: hunks overlap

anatawa12 · anatawa12 · commit 18b1ebdbe074 · 2021-09-14T14:46:07.000+09:00
(cherry picked from commit b367d53)
diff --git a/src/diff/mod.rs b/src/diff/mod.rs
@@ -235,7 +235,7 @@ fn to_hunks<'a, T: ?Sized>(
                 // Check to see if we can merge the hunks
                 let start1_next =
                     cmp::min(s.old.start, lines1.len() - 1).saturating_sub(context_len);
-                if start1_next < end1 {
+                if start1_next <= end1 {
                     // Context lines between hunks
                     for (_i1, i2) in (script.old.end..s.old.start).zip(script.new.end..s.new.start)
                     {

Original file line number	Diff line number	Diff line change
`@@ -235,7 +235,7 @@ fn to_hunks<'a, T: ?Sized>(`
`235`	`235`	`// Check to see if we can merge the hunks`
`236`	`236`	`let start1_next =`
`237`	`237`	`cmp::min(s.old.start, lines1.len() - 1).saturating_sub(context_len);`
`238`		`- if start1_next < end1 {`
	`238`	`+ if start1_next <= end1 {`
`239`	`239`	`// Context lines between hunks`
`240`	`240`	`for (_i1, i2) in (script.old.end..s.old.start).zip(script.new.end..s.new.start)`
`241`	`241`	`{`