Expanding diff view broken

[noerw]

Gitea Version

1.16.0+dev-841-gd413a1f8a d413a1f

Git Version

Operating System

latest firefox

How are you running Gitea?

irrelevant

Database

No response

Can you reproduce the bug on the Gitea demo site?

Yes

Log Gist

No response

Description

Expanding a diff results in broken rendering of the diff, see also attached video.

afaik this happens on PR diff page, as well as commit diff page.

Screenshots

gitea_diff-2022-01-15_12.46.02.mp4

[silverwind]

Weird one, the JS spews some apparently escaped HTML into the DOM.

I think it must be a recent regression. Maybe worth a bisect.

[wxiaoguang]

The bug is caused by we wrote <code class="code-inner">{{$.section.GetComputedInlineDiffFor $line}}</code> ( Add warning for BIDI characters in page renders and in diffs (#17562) )

Before, GetComputedInlineDiffFor returns HTML text.

Now, GetComputedInlineDiffFor returns DiffInline struct, so we should change the forgotten {{$.section.GetComputedInlineDiffFor $line}} call to output the DiffInline.Content.

Possible code:

gitea/templates/repo/diff/blob_excerpt.tmpl

Line 71 in d7c2a29

<td class="blob-excerpt lines-code{{if (not $line.RightIdx)}} lines-code-old{{end}}"><code class="code-inner">{{$.section.GetComputedInlineDiffFor $line}}</code></td>

[zeripath]

agh this is due to an interaction between the BIDI pr and the diff PR.

When the diff PR was created the BIDI PR wasn't merged and when the BIDI PR was created the diff PR wasn't merged.

[zeripath]

Actually no it's a bit of debugging code that got left in.

[andre161292]

This is still broken. Please have a look at https://try.gitea.io/testerxxx/gitea/pulls/1/files (or any other diff on try.gitea.io).

I'm also experiencing the issue in the gitea/gitea:1.16.0-linux-amd64 docker image.

[wxiaoguang]

I managed to reproduce the bug: