fixing indicies when using myers algorithm

yazgazan · yazgazan · commit f8fcfc72f3d7 · 2018-07-05T17:00:53.000+02:00
diff --git a/diff/slice.go b/diff/slice.go
@@ -60,11 +60,11 @@ func myersToDiff(conf config, lhs, rhs reflect.Value, changes []myersdiff.Change
 			res = append(res, sliceMissing{lhs.Index(lhsIdx + d).Interface()})
 			indices = append(indices, lhsIdx+d)
 		}
-		lhsIdx += c.Del
 		for i := 0; i < c.Ins; i++ {
 			res = append(res, sliceExcess{rhs.Index(rhsIdx + i).Interface()})
-			indices = append(indices, rhsIdx+i)
+			indices = append(indices, lhsIdx+i)
 		}
+		lhsIdx += c.Del
 		rhsIdx += c.Ins
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -60,11 +60,11 @@ func myersToDiff(conf config, lhs, rhs reflect.Value, changes []myersdiff.Change`
`60`	`60`	`res = append(res, sliceMissing{lhs.Index(lhsIdx + d).Interface()})`
`61`	`61`	`indices = append(indices, lhsIdx+d)`
`62`	`62`	`}`
`63`		`- lhsIdx += c.Del`
`64`	`63`	`for i := 0; i < c.Ins; i++ {`
`65`	`64`	`res = append(res, sliceExcess{rhs.Index(rhsIdx + i).Interface()})`
`66`		`- indices = append(indices, rhsIdx+i)`
	`65`	`+ indices = append(indices, lhsIdx+i)`
`67`	`66`	`}`
	`67`	`+ lhsIdx += c.Del`
`68`	`68`	`rhsIdx += c.Ins`
`69`	`69`	`}`
`70`	`70`