commit 085e8b9caf04a9ee20fc713d0e6a8689307ff02f
author Sergi Mansilla <sergi.mansilla@gmail.com> Fri Jul 25 17:16:42 2014 +0200
committer Sergi Mansilla <sergi.mansilla@gmail.com> Fri Jul 25 17:16:42 2014 +0200
tree 04c1dec8b6ec66ca1c92b4d65817d1dcfaeb989c
parent bf552227cac4fcc47e9c014561fcf3eaae0565e0
parent af0ba86d2513c48226cd24a36548b3684f8d4d03

Merge pull request #12 from goojba/utf8bug

Use []rune in diff internals

diffmatchpatch/dmp.go

diff --git a/diffmatchpatch/dmp.go b/diffmatchpatch/dmp.go
index 24e956d..dba0133 100644
--- a/diffmatchpatch/dmp.go
+++ b/diffmatchpatch/dmp.go
@@ -20,6 +20,7 @@
 	"bytes"
 	"errors"
 	"fmt"
+	"html"
 	"math"
 	"net/url"
 	"regexp"
@@ -1294,34 +1295,30 @@
 	return last_chars2 + (loc - last_chars1)
 }
 
-/**
- * Convert a Diff list into a pretty HTML report.
- * @param diffs List of Diff objects.
- * @return HTML representation.
- */
-/*
-   func (dmp *DiffMatchPatch) diffPrettyHtml(diffs []Diff) {
-     StringBuilder html = new StringBuilder()
-     foreach (Diff aDiff in diffs) {
-       text := aDiff.text.Replace("&", "&amp;").Replace("<", "&lt;")
-         .Replace(">", "&gt;").Replace("\n", "&para;<br>")
-       switch (aDiff.Type) {
-         case DiffInsert:
-           html.Append("<ins style=\"background:#e6ffe6;\">").Append(text)
-               .Append("</ins>")
-           break
-         case DiffDelete:
-           html.Append("<del style=\"background:#ffe6e6;\">").Append(text)
-               .Append("</del>")
-           break
-         case DiffEqual:
-           html.Append("<span>").Append(text).Append("</span>")
-           break
-       }
-     }
-     return html.ToString()
-   }
-*/
+// DiffPrettyHtml converts a []Diff into a pretty HTML report.
+// It is intended as an example from which to write one's own
+// display functions.
+func (dmp *DiffMatchPatch) DiffPrettyHtml(diffs []Diff) string {
+	var buff bytes.Buffer
+	for _, diff := range diffs {
+		text := strings.Replace(html.EscapeString(diff.Text), "\n", "&para;<br>", -1)
+		switch diff.Type {
+		case DiffInsert:
+			buff.WriteString("<ins style=\"background:#e6ffe6;\">")
+			buff.WriteString(text)
+			buff.WriteString("</ins>")
+		case DiffDelete:
+			buff.WriteString("<del style=\"background:#ffe6e6;\">")
+			buff.WriteString(text)
+			buff.WriteString("</del>")
+		case DiffEqual:
+			buff.WriteString("<span>")
+			buff.WriteString(text)
+			buff.WriteString("</span>")
+		}
+	}
+	return buff.String()
+}
 
 // Diff_text1 computes and returns the source text (all equalities and deletions).
 func (dmp *DiffMatchPatch) DiffText1(diffs []Diff) string {

diffmatchpatch/dmp_test.go

diff --git a/diffmatchpatch/dmp_test.go b/diffmatchpatch/dmp_test.go
index cf83344..a6af9ae 100644
--- a/diffmatchpatch/dmp_test.go
+++ b/diffmatchpatch/dmp_test.go
@@ -681,17 +681,16 @@
 	dmp.DiffEditCost = 4
 }
 
-/*
 func Test_diffPrettyHtml(t *testing.T) {
-    dmp := New()
-    // Pretty print.
-    diffs := []Diff{
-        Diff{DiffEqual, "a\n"},
-        Diff{DiffDelete, "<B>b</B>"},
-        Diff{DiffInsert, "c&d"}}
-    assert.Equal(t, "<span>a&para;<br></span><del style=\"background:#ffe6e6;\">&lt;B&gt;b&lt;/B&gt;</del><ins style=\"background:#e6ffe6;\">c&amp;d</ins>",
-        dmp.DiffPrettyHtml(diffs))
-}*/
+	dmp := New()
+	// Pretty print.
+	diffs := []Diff{
+		Diff{DiffEqual, "a\n"},
+		Diff{DiffDelete, "<B>b</B>"},
+		Diff{DiffInsert, "c&d"}}
+	assert.Equal(t, "<span>a&para;<br></span><del style=\"background:#ffe6e6;\">&lt;B&gt;b&lt;/B&gt;</del><ins style=\"background:#e6ffe6;\">c&amp;d</ins>",
+		dmp.DiffPrettyHtml(diffs))
+}
 
 func Test_diffText(t *testing.T) {
 	dmp := New()