- calling template.HTMLEscapeString directly in diffWithHighlight since we dont actually need to highlight the code here

- adding newline in testcase

Author: dfirebaugh

services/gitdiff/highlightdiff.go

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

services/gitdiff/highlightdiff_test.go

@@ -19,11 +19,11 @@ func TestDiffWithHighlight(t *testing.T) {
 		"		run(db)\n",
 	)
 
-	expected := `		run(<span class="removed-code">&#39;&lt;&gt;&#39;</span>)`
+	expected := "\t\trun(<span class=\"removed-code\">&#39;&lt;&gt;&#39;</span>)\n"
 	output := diffToHTML(nil, diffs, DiffLineDel)
 	assert.Equal(t, expected, output)
 
-	expected = `		run(<span class="added-code">db</span>)`
+	expected = "\t\trun(<span class=\"added-code\">db</span>)\n"
 	output = diffToHTML(nil, diffs, DiffLineAdd)
 	assert.Equal(t, expected, output)