switch {
case len(v.New) == 0 && len(v.Ref) == 0:
return fmt.Sprintf("%d=", v.Position)
+ case len(v.New) == 1 && v.New == v.Ref:
+ return fmt.Sprintf("%d=", v.Position)
+ case v.New == v.Ref:
+ return fmt.Sprintf("%d_%d=", v.Position, v.Position+len(v.Ref)-1)
case len(v.New) == 0 && len(v.Ref) == 1:
return fmt.Sprintf("%ddel", v.Position)
case len(v.New) == 0:
v.New += diffs[i].Text
}
}
+ if len(v.Ref) == 2 && len(v.New) == 2 {
+ v1 := v
+ v1.Ref = v1.Ref[:1]
+ v1.New = v1.New[:1]
+ v.Ref = v.Ref[1:]
+ v.New = v.New[1:]
+ v.Position++
+ v.Left = v1.Ref
+ pos++
+ variants = append(variants, v1)
+ }
pos += len(v.Ref)
variants = append(variants, v)
left = ""
in, out = out, make([]diffmatchpatch.Diff, 0, len(in))
for i := 0; i < len(in); i++ {
d := in[i]
+ // when diffmatchpatch says [=yyyyXXXX, delX, =zzz],
+ // we really want [=yyyy, delX, =XXXXzzz] (ditto for
+ // ins instead of del)
+ if i < len(in)-2 &&
+ d.Type == diffmatchpatch.DiffEqual &&
+ in[i+1].Type != diffmatchpatch.DiffEqual &&
+ in[i+2].Type == diffmatchpatch.DiffEqual &&
+ len(in[i+1].Text) <= len(d.Text) {
+ for cut := 0; cut < len(d.Text)-len(in[i+1].Text); cut++ {
+ if d.Text[cut:] == d.Text[cut+len(in[i+1].Text):]+in[i+1].Text {
+ in[i+2].Text = d.Text[cut+len(in[i+1].Text):] + in[i+1].Text + in[i+2].Text
+ in[i+1].Text = d.Text[cut : cut+len(in[i+1].Text)]
+ d.Text = d.Text[:cut]
+ break
+ }
+ }
+ }
// diffmatchpatch solves diff("AAX","XTX") with
// [delAA,=X,insTX] but we prefer to spell it
// [delAA,insXT,=X].
in[i+1].Text+in[i+2].Text == in[i+2].Text+in[i+1].Text {
in[i+2], in[i+1] = in[i+1], in[i+2]
}
+ // Likewise, diffmatchpatch solves
+ // diff("XXXA","XXAA") with [delX,=XXA,insA], we
+ // prefer [=XX,delX,insA,=A]
+ if i < len(in)-2 &&
+ d.Type == diffmatchpatch.DiffDelete &&
+ in[i+1].Type == diffmatchpatch.DiffEqual &&
+ in[i+2].Type == diffmatchpatch.DiffInsert {
+ redo := false
+ for x := len(d.Text); x <= len(in[i+1].Text)-len(in[i+2].Text); x++ {
+ // d in[i+1] in[i+2]
+ // x xxx aaa a
+ // ^
+ // x xx
+ // xxx
+ // aaa
+ // aa a
+ if d.Text+in[i+1].Text[:x-len(d.Text)] == in[i+1].Text[:x] &&
+ in[i+1].Text[x:] == in[i+1].Text[x+len(in[i+2].Text):]+in[i+2].Text {
+ out = append(out, diffmatchpatch.Diff{diffmatchpatch.DiffEqual, d.Text + in[i+1].Text[:x-len(d.Text)]})
+ in[i], in[i+1], in[i+2] = diffmatchpatch.Diff{diffmatchpatch.DiffDelete, in[i+1].Text[x-len(d.Text) : x]},
+ diffmatchpatch.Diff{diffmatchpatch.DiffInsert, in[i+1].Text[x : x+len(in[i+2].Text)]},
+ diffmatchpatch.Diff{diffmatchpatch.DiffEqual, in[i+1].Text[x+len(in[i+2].Text):] + in[i+2].Text}
+ redo = true
+ break
+ }
+ }
+ if redo {
+ i--
+ continue
+ }
+ }
// when diffmatchpatch says [delAAA, insXAY] and
// len(X)==1, we prefer to treat the A>X as a snp.
if i < len(in)-1 &&
d.Type == diffmatchpatch.DiffDelete &&
in[i+1].Type == diffmatchpatch.DiffInsert &&
- len(d.Text) > 2 &&
- len(in[i+1].Text) > 2 &&
+ len(d.Text) >= 2 &&
+ len(in[i+1].Text) >= 2 &&
d.Text[1] == in[i+1].Text[1] {
eqend := 2
for ; eqend < len(d.Text) && eqend < len(in[i+1].Text) && d.Text[eqend] == in[i+1].Text[eqend]; eqend++ {
if i < len(in)-1 &&
d.Type == diffmatchpatch.DiffDelete &&
in[i+1].Type == diffmatchpatch.DiffInsert &&
- len(d.Text) > 2 &&
- len(in[i+1].Text) > 2 &&
+ len(d.Text) >= 2 &&
+ len(in[i+1].Text) >= 2 &&
d.Text[len(d.Text)-2] == in[i+1].Text[len(in[i+1].Text)-2] {
// eqstart will be the number of equal chars
// before the terminal snp, plus 1 for the snp
i++
continue
}
+ // [=AB,insCB,=D] => [=A,insBC,=BD]
+ // and
+ // [=AB,delCB,=D] => [=A,delBC,=BD]
+ if i < len(in)-2 &&
+ d.Type == diffmatchpatch.DiffEqual &&
+ in[i+1].Type != diffmatchpatch.DiffEqual &&
+ in[i+2].Type == diffmatchpatch.DiffEqual &&
+ len(d.Text) > 0 && len(in[i+1].Text) > 0 &&
+ !(i+3 < len(in) &&
+ // Except: leave deletion alone if an
+ // upcoming insertion will be moved up
+ // against it: e.g., for
+ // [=AB,delCB,=D,insED] we want
+ // [=AB,delCB,=D,insED] for now, so it
+ // can become [=AB,delCB,insDE,=D] on
+ // the next iteration.
+ in[i+1].Type == diffmatchpatch.DiffDelete &&
+ in[i+3].Type == diffmatchpatch.DiffInsert &&
+ strings.HasSuffix(in[i+3].Text, in[i+2].Text)) {
+ if i+3 < len(in) && in[i+1].Type == in[i+3].Type && strings.HasSuffix(in[i+3].Text, in[i+2].Text) {
+ // [=AB,delC,=E,delDBE] => [=AB,delCEDB,=E,=]
+ in[i+1], in[i+2], in[i+3] = diffmatchpatch.Diff{in[i+1].Type, in[i+1].Text + in[i+2].Text + in[i+3].Text[:len(in[i+3].Text)-len(in[i+2].Text)]},
+ diffmatchpatch.Diff{diffmatchpatch.DiffEqual, in[i+2].Text},
+ diffmatchpatch.Diff{diffmatchpatch.DiffEqual, ""}
+ }
+ // Find x, length of common suffix B
+ x := 1
+ for ; x <= len(d.Text) && x <= len(in[i+1].Text); x++ {
+ if d.Text[len(d.Text)-x] != in[i+1].Text[len(in[i+1].Text)-x] {
+ break
+ }
+ }
+ x--
+ d.Text, in[i+1].Text, in[i+2].Text =
+ d.Text[:len(d.Text)-x],
+ d.Text[len(d.Text)-x:]+
+ in[i+1].Text[:len(in[i+1].Text)-x],
+ in[i+1].Text[len(in[i+1].Text)-x:]+in[i+2].Text
+ }
+ // [=X,delAX] => [delXA,=X]
+ if i < len(in)-1 &&
+ d.Type == diffmatchpatch.DiffEqual &&
+ in[i+1].Type == diffmatchpatch.DiffDelete && false {
+ }
out = append(out, d)
}
+ in, out = out, make([]diffmatchpatch.Diff, 0, len(in))
+ for _, d := range in {
+ if len(d.Text) > 0 {
+ out = append(out, d)
+ }
+ }
+ // for i := 0; i < len(out)-1; i++ {
+ // if out[i].Type == diffmatchpatch.DiffDelete && len(out[i].Text) == 2 &&
+ // out[i+1].Type == diffmatchpatch.DiffInsert && len(out[i+1].Text) == 2 {
+ // out = append(out, diffmatchpatch.Diff{}, diffmatchpatch.Diff{})
+ // copy(out[i+4:], out[i+2:])
+ // out[i+2] = diffmatchpatch.Diff{diffmatchpatch.DiffDelete, out[i].Text[1:]}
+ // out[i+3] = diffmatchpatch.Diff{diffmatchpatch.DiffInsert, out[i+1].Text[1:]}
+ // out[i].Text = out[i].Text[:1]
+ // out[i+1].Text = out[i+1].Text[:1]
+ // }
+ // }
return
}
projects / lightning.git / blobdiff