From 9349def72e687c590ed34403f7663c309376610e Mon Sep 17 00:00:00 2001 From: Unknwon Date: Tue, 16 Aug 2016 07:33:53 -0700 Subject: #3464 reproduce diff signs Commited wrong file. --- models/git_diff.go | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'models') diff --git a/models/git_diff.go b/models/git_diff.go index a63a1bb9..a45c4434 100644 --- a/models/git_diff.go +++ b/models/git_diff.go @@ -72,6 +72,15 @@ var ( func diffToHTML(diffs []diffmatchpatch.Diff, lineType DiffLineType) template.HTML { buf := bytes.NewBuffer(nil) + + // Reproduce signs which are cutted for inline diff before. + switch lineType { + case DIFF_LINE_ADD: + buf.WriteByte('+') + case DIFF_LINE_DEL: + buf.WriteByte('-') + } + for i := range diffs { switch { case diffs[i].Type == diffmatchpatch.DiffInsert && lineType == DIFF_LINE_ADD: @@ -167,7 +176,7 @@ func (diffSection *DiffSection) GetComputedInlineDiffFor(diffLine *DiffLine) tem diff1 = diffLine.Content diff2 = compareDiffLine.Content default: - return template.HTML(html.EscapeString(diffLine.Content[1:])) + return template.HTML(html.EscapeString(diffLine.Content)) } diffRecord := diffMatchPatch.DiffMain(diff1[1:], diff2[1:], true) -- cgit v1.2.3