github/pmezard.go-difflib
2
0
Fork 0
mirror of https://github.com/pmezard/go-difflib.git synced 2026-03-31 08:37:10 +09:00
Code Issues Packages Projects Releases Wiki Activity

difflib: fix error handling in WriteContextDiff

Browse Source
This commit is contained in:
Patrick Mezard
2015-12-07 19:24:13 +01:00
parent 017ffa654c
commit 7b7f521a6e
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
difflib/difflib.go
View File

@@ -679,11 +679,13 @@ func WriteContextDiff(writer io.Writer, diff ContextDiff) error {
diffErr = err
}
}
ws := func(s string) error {
ws := func(s string) {
_, err := buf.WriteString(s)
return err
if diffErr == nil && err != nil {
diffErr = err
}
}
if len(diff.Eol) == 0 {
diff.Eol = "\n"
}
@@ -713,7 +715,7 @@ func WriteContextDiff(writer io.Writer, diff ContextDiff) error {
}
first, last := g[0], g[len(g)-1]
wf("***************" + diff.Eol)
ws("***************" + diff.Eol)
range1 := formatRangeContext(first.I1, last.I2)
wf("*** %s ****%s", range1, diff.Eol)