- removing filename and language from diffWithHighlight func

Author: dfirebaugh

services/gitdiff/gitdiff.go

@@ -301,10 +301,6 @@ func (diffSection *DiffSection) GetComputedInlineDiffFor(diffLine *DiffLine, loc
 		diff2           string
 	)
 
-	language := ""
-	if diffSection.file != nil {
-		language = diffSection.file.Language
-	}
 	// try to find equivalent diff line. ignore, otherwise
 	switch diffLine.Type {
 	case DiffLineSection:
@@ -335,10 +331,10 @@ func (diffSection *DiffSection) GetComputedInlineDiffFor(diffLine *DiffLine, loc
 	}
 
 	hcd := newHighlightCodeDiff()
-	diffRecord := hcd.diffWithHighlight(diffSection.FileName, language, diff1, diff2)
+	diffRecord := hcd.diffWithHighlight(diff1, diff2)
 	// it seems that Gitea doesn't need the line wrapper of Chroma, so do not add them back
 	// if the line wrappers are still needed in the future, it can be added back by "diffToHTML(hcd.lineWrapperTags. ...)"
-	diffHTML := html.UnescapeString(diffToHTML(nil, diffRecord, diffLine.Type))
+	diffHTML := diffToHTML(nil, diffRecord, diffLine.Type)
 	return DiffInlineWithUnicodeEscape(template.HTML(diffHTML), locale)
 }
 

services/gitdiff/highlightdiff.go

@@ -84,7 +84,7 @@ func (hcd *highlightCodeDiff) collectUsedRunes(code string) {
 	}
 }
 
-func (hcd *highlightCodeDiff) diffWithHighlight(filename, language, codeA, codeB string) []diffmatchpatch.Diff {
+func (hcd *highlightCodeDiff) diffWithHighlight(codeA, codeB string) []diffmatchpatch.Diff {
 	hcd.collectUsedRunes(codeA)
 	hcd.collectUsedRunes(codeB)
 

services/gitdiff/highlightdiff_test.go

@@ -14,7 +14,6 @@ import (
 func TestDiffWithHighlight(t *testing.T) {
 	hcd := newHighlightCodeDiff()
 	diffs := hcd.diffWithHighlight(
-		"main.v", "",
 		"		run('<>')\n",
 		"		run(db)\n",
 	)
@@ -42,7 +41,6 @@ func TestDiffWithHighlight(t *testing.T) {
 func TestDiffWithHighlightPlaceholder(t *testing.T) {
 	hcd := newHighlightCodeDiff()
 	diffs := hcd.diffWithHighlight(
-		"main.js", "",
 		"a='\U00100000'",
 		"a='\U0010FFFD''",
 	)
@@ -55,7 +53,6 @@ func TestDiffWithHighlightPlaceholder(t *testing.T) {
 
 	hcd = newHighlightCodeDiff()
 	diffs = hcd.diffWithHighlight(
-		"main.js", "",
 		"a='\U00100000'",
 		"a='\U0010FFFD'",
 	)
@@ -68,7 +65,6 @@ func TestDiffWithHighlightPlaceholderExhausted(t *testing.T) {
 	hcd := newHighlightCodeDiff()
 	hcd.placeholderMaxCount = 0
 	diffs := hcd.diffWithHighlight(
-		"main.js", "",
 		"'",
 		``,
 	)
@@ -79,7 +75,6 @@ func TestDiffWithHighlightPlaceholderExhausted(t *testing.T) {
 	hcd = newHighlightCodeDiff()
 	hcd.placeholderMaxCount = 0
 	diffs = hcd.diffWithHighlight(
-		"main.js", "",
 		"a < b",
 		"a > b",
 	)