- readding call to highligh.Code in diffWithHighlight

- reverting tests to be closer to original

Author: dfirebaugh

services/gitdiff/highlightdiff.go

@@ -6,6 +6,7 @@ package gitdiff
 import (
 	"strings"
 
+	"code.gitea.io/gitea/modules/highlight"
 	"github.com/sergi/go-diff/diffmatchpatch"
 )
 
@@ -88,8 +89,11 @@ func (hcd *highlightCodeDiff) diffWithHighlight(codeA, codeB string) []diffmatch
 	hcd.collectUsedRunes(codeA)
 	hcd.collectUsedRunes(codeB)
 
-	convertedCodeA := hcd.convertToPlaceholders(codeA)
-	convertedCodeB := hcd.convertToPlaceholders(codeB)
+	highlightCodeA, _ := highlight.Code("", "", codeA)
+	highlightCodeB, _ := highlight.Code("", "", codeB)
+
+	convertedCodeA := hcd.convertToPlaceholders(string(highlightCodeA))
+	convertedCodeB := hcd.convertToPlaceholders(string(highlightCodeB))
 
 	diffs := diffMatchPatch.DiffMain(convertedCodeA, convertedCodeB, true)
 	diffs = diffMatchPatch.DiffCleanupEfficiency(diffs)

services/gitdiff/highlightdiff_test.go

@@ -5,6 +5,7 @@ package gitdiff
 
 import (
 	"fmt"
+	"strings"
 	"testing"
 
 	"github.com/sergi/go-diff/diffmatchpatch"
@@ -18,13 +19,11 @@ func TestDiffWithHighlight(t *testing.T) {
 		"		run(db)\n",
 	)
 
-	expected := "\t\trun(<span class=\"removed-code\">'<>'</></span>)\n"
-
+	expected := `		run(<span class="removed-code">&#39;&lt;&gt;&#39;</span>)`
 	output := diffToHTML(nil, diffs, DiffLineDel)
 	assert.Equal(t, expected, output)
 
-	expected = `		run(<span class="added-code">db</span>)
-`
+	expected = `		run(<span class="added-code">db</span>)`
 	output = diffToHTML(nil, diffs, DiffLineAdd)
 	assert.Equal(t, expected, output)
 
@@ -33,6 +32,14 @@ func TestDiffWithHighlight(t *testing.T) {
 	hcd.placeholderTokenMap['C'] = "</span>"
 	diff := diffmatchpatch.Diff{}
 
+	diff.Text = "OC"
+	hcd.recoverOneDiff(&diff)
+	assert.Equal(t, "<span></span>", diff.Text)
+
+	diff.Text = "O"
+	hcd.recoverOneDiff(&diff)
+	assert.Equal(t, "<span></span>", diff.Text)
+
 	diff.Text = "C"
 	hcd.recoverOneDiff(&diff)
 	assert.Equal(t, "", diff.Text)
@@ -47,7 +54,7 @@ func TestDiffWithHighlightPlaceholder(t *testing.T) {
 	assert.Equal(t, "", hcd.placeholderTokenMap[0x00100000])
 	assert.Equal(t, "", hcd.placeholderTokenMap[0x0010FFFD])
 
-	expected := fmt.Sprintf(`a='<span class="removed-code">%s</span>'`, "\U00100000")
+	expected := fmt.Sprintf(`a=&#39;<span class="removed-code">%s</span>&#39;`, "\U00100000")
 	output := diffToHTML(hcd.lineWrapperTags, diffs, DiffLineDel)
 	assert.Equal(t, expected, output)
 
@@ -56,7 +63,7 @@ func TestDiffWithHighlightPlaceholder(t *testing.T) {
 		"a='\U00100000'",
 		"a='\U0010FFFD'",
 	)
-	expected = fmt.Sprintf(`a='<span class="added-code">%s</span>'`, "\U0010FFFD")
+	expected = fmt.Sprintf(`a=&#39;<span class="added-code">%s</span>&#39;`, "\U0010FFFD")
 	output = diffToHTML(nil, diffs, DiffLineAdd)
 	assert.Equal(t, expected, output)
 }
@@ -69,20 +76,44 @@ func TestDiffWithHighlightPlaceholderExhausted(t *testing.T) {
 		``,
 	)
 	output := diffToHTML(nil, diffs, DiffLineDel)
-	expected := `<span class="removed-code">'</span>`
+	expected := fmt.Sprintf(`<span class="removed-code">%s#39;</span>`, "\uFFFD")
 	assert.Equal(t, expected, output)
 
 	hcd = newHighlightCodeDiff()
 	hcd.placeholderMaxCount = 0
 	diffs = hcd.diffWithHighlight(
-		"a this_is_not_html_at_this_point b",
-		"a this_is_is_still_not_html_at_this_point_its_just_a_string b",
+		"a < b",
+		"a > b",
 	)
 	output = diffToHTML(nil, diffs, DiffLineDel)
-	expected = "a this_is_not_html_at_this_point b"
+	expected = fmt.Sprintf(`a %s<span class="removed-code">l</span>t; b`, "\uFFFD")
 	assert.Equal(t, expected, output)
 
 	output = diffToHTML(nil, diffs, DiffLineAdd)
-	expected = "a this_is_<span class=\"added-code\">is_still_</span>not_html_at_this_point<span class=\"added-code\">_its_just_a_string</span> b"
+	expected = fmt.Sprintf(`a %s<span class="added-code">g</span>t; b`, "\uFFFD")
 	assert.Equal(t, expected, output)
 }
+
+func TestDiffWithHighlightTagMatch(t *testing.T) {
+	totalOverflow := 0
+	for i := 0; i < 100; i++ {
+		hcd := newHighlightCodeDiff()
+		hcd.placeholderMaxCount = i
+		diffs := hcd.diffWithHighlight(
+			"a='1'",
+			"b='2'",
+		)
+		totalOverflow += hcd.placeholderOverflowCount
+
+		output := diffToHTML(nil, diffs, DiffLineDel)
+		c1 := strings.Count(output, "<span")
+		c2 := strings.Count(output, "</span")
+		assert.Equal(t, c1, c2)
+
+		output = diffToHTML(nil, diffs, DiffLineAdd)
+		c1 = strings.Count(output, "<span")
+		c2 = strings.Count(output, "</span")
+		assert.Equal(t, c1, c2)
+	}
+	assert.NotZero(t, totalOverflow)
+}