noth/surrealpatch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don’t apply text diff if an error occurs

Browse source
This commit is contained in:
Tobie Morgan Hitchcock 2018-12-28 10:53:28 +01:00
parent 9819b64dc6
commit c8d70c780c
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
util/diff/diff.go
View file

@ -239,9 +239,10 @@ func (o *operations) patch(old map[string]interface{}) (now map[string]interface
case "change": case "change":
if txt, ok := obj.Get(path...).Data().(string); ok { if txt, ok := obj.Get(path...).Data().(string); ok {
dmp := diffmatchpatch.New() dmp := diffmatchpatch.New()
dif, _ := dmp.DiffFromDelta(txt, v.value.(string)) if dif, err := dmp.DiffFromDelta(txt, v.value.(string)); err == nil {
str := dmp.DiffText2(dif) str := dmp.DiffText2(dif)
obj.Set(str, path...) obj.Set(str, path...)
}
} }
} }