From 901e4f8c4647fc73b0789417f91c73d5da736370 Mon Sep 17 00:00:00 2001
From: visualfc <visualfc@gmail.com>
Date: Mon, 7 Dec 2015 21:12:49 +0800
Subject: [PATCH] fix WriteUnifiedDiff fmt.Sprintf format error

---
 difflib/difflib.go      | 18 +++++----
 difflib/difflib_test.go | 82 +++++++++++++++++++++++++++++++++++++++--
 2 files changed, 89 insertions(+), 11 deletions(-)

diff --git a/difflib/difflib.go b/difflib/difflib.go
index 64cc40f..a534525 100644
--- a/difflib/difflib.go
+++ b/difflib/difflib.go
@@ -559,10 +559,14 @@ type UnifiedDiff struct {
 func WriteUnifiedDiff(writer io.Writer, diff UnifiedDiff) error {
 	buf := bufio.NewWriter(writer)
 	defer buf.Flush()
-	w := func(format string, args ...interface{}) error {
+	wf := func(format string, args ...interface{}) error {
 		_, err := buf.WriteString(fmt.Sprintf(format, args...))
 		return err
 	}
+	ws := func(s string) error {
+		_, err := buf.WriteString(s)
+		return err
+	}
 
 	if len(diff.Eol) == 0 {
 		diff.Eol = "\n"
@@ -581,11 +585,11 @@ func WriteUnifiedDiff(writer io.Writer, diff UnifiedDiff) error {
 			if len(diff.ToDate) > 0 {
 				toDate = "\t" + diff.ToDate
 			}
-			err := w("--- %s%s%s", diff.FromFile, fromDate, diff.Eol)
+			err := wf("--- %s%s%s", diff.FromFile, fromDate, diff.Eol)
 			if err != nil {
 				return err
 			}
-			err = w("+++ %s%s%s", diff.ToFile, toDate, diff.Eol)
+			err = wf("+++ %s%s%s", diff.ToFile, toDate, diff.Eol)
 			if err != nil {
 				return err
 			}
@@ -593,14 +597,14 @@ func WriteUnifiedDiff(writer io.Writer, diff UnifiedDiff) error {
 		first, last := g[0], g[len(g)-1]
 		range1 := formatRangeUnified(first.I1, last.I2)
 		range2 := formatRangeUnified(first.J1, last.J2)
-		if err := w("@@ -%s +%s @@%s", range1, range2, diff.Eol); err != nil {
+		if err := wf("@@ -%s +%s @@%s", range1, range2, diff.Eol); err != nil {
 			return err
 		}
 		for _, c := range g {
 			i1, i2, j1, j2 := c.I1, c.I2, c.J1, c.J2
 			if c.Tag == 'e' {
 				for _, line := range diff.A[i1:i2] {
-					if err := w(" " + line); err != nil {
+					if err := ws(" " + line); err != nil {
 						return err
 					}
 				}
@@ -608,14 +612,14 @@ func WriteUnifiedDiff(writer io.Writer, diff UnifiedDiff) error {
 			}
 			if c.Tag == 'r' || c.Tag == 'd' {
 				for _, line := range diff.A[i1:i2] {
-					if err := w("-" + line); err != nil {
+					if err := ws("-" + line); err != nil {
 						return err
 					}
 				}
 			}
 			if c.Tag == 'r' || c.Tag == 'i' {
 				for _, line := range diff.B[j1:j2] {
-					if err := w("+" + line); err != nil {
+					if err := ws("+" + line); err != nil {
 						return err
 					}
 				}
diff --git a/difflib/difflib_test.go b/difflib/difflib_test.go
index 94670be..eb1cccc 100644
--- a/difflib/difflib_test.go
+++ b/difflib/difflib_test.go
@@ -102,11 +102,13 @@ group
 	}
 }
 
-func ExampleGetUnifiedDiffString() {
+func ExampleGetUnifiedDiffCode() {
 	a := `one
 two
 three
-four`
+four
+fmt.Printf("%s,%T",a,b)
+`
 	b := `zero
 one
 three
@@ -121,16 +123,88 @@ four`
 		Context:  3,
 	}
 	result, _ := GetUnifiedDiffString(diff)
-	fmt.Printf(strings.Replace(result, "\t", " ", -1))
+	fmt.Println(strings.Replace(result, "\t", " ", -1))
 	// Output:
 	// --- Original 2005-01-26 23:30:50
 	// +++ Current 2010-04-02 10:20:52
-	// @@ -1,4 +1,4 @@
+	// @@ -1,6 +1,4 @@
 	// +zero
 	//  one
 	// -two
 	//  three
 	//  four
+	// -fmt.Printf("%s,%T",a,b)
+	// -
+}
+
+func ExampleGetUnifiedDiffString() {
+	a := `one
+two
+three
+four
+fmt.Printf("%s,%T",a,b)
+`
+	b := `zero
+one
+three
+four`
+	diff := UnifiedDiff{
+		A:        SplitLines(a),
+		B:        SplitLines(b),
+		FromFile: "Original",
+		FromDate: "2005-01-26 23:30:50",
+		ToFile:   "Current",
+		ToDate:   "2010-04-02 10:20:52",
+		Context:  3,
+	}
+	result, _ := GetUnifiedDiffString(diff)
+	fmt.Println(strings.Replace(result, "\t", " ", -1))
+	// Output:
+	// --- Original 2005-01-26 23:30:50
+	// +++ Current 2010-04-02 10:20:52
+	// @@ -1,6 +1,4 @@
+	// +zero
+	//  one
+	// -two
+	//  three
+	//  four
+	// -fmt.Printf("%s,%T",a,b)
+	// -
+}
+
+func ExampleGetContextDiffCode() {
+	a := `one
+two
+three
+four`
+	b := `zero
+one
+tree
+four`
+	diff := ContextDiff{
+		A:        SplitLines(a),
+		B:        SplitLines(b),
+		FromFile: "Original",
+		ToFile:   "Current",
+		Context:  3,
+		Eol:      "\n",
+	}
+	result, _ := GetContextDiffString(diff)
+	fmt.Printf(strings.Replace(result, "\t", " ", -1))
+	// Output:
+	// *** Original
+	// --- Current
+	// ***************
+	// *** 1,4 ****
+	//   one
+	// ! two
+	// ! three
+	//   four
+	// --- 1,4 ----
+	// + zero
+	//   one
+	// ! tree
+	//   four
 }
 
 func ExampleGetContextDiffString() {