Incorrect highlighted lines of the Files Changed view of a pull request

[typeless]

Description

The downloaded patch:

The Files Changed view:

Gitea Version

1.24.2

Can you reproduce the bug on the Gitea demo site?

No

Log Gist

No response

Screenshots

No response

Git Version

2.43.0

Operating System

Ubuntu Server 24.04 LTS

How are you running Gitea?

https://docs.gitea.com/installation/install-from-binary
Managed by Systemd.

Database

PostgreSQL

[wxiaoguang]

Can you share the file or a link to the commit?

[typeless]

@wxiaoguang Unfortunately, that is a proprietary project. I cannot share it.

[wxiaoguang]

Or are you able to provide a reproducible sample?

[wxiaoguang]

Unable to reproduce by the content from your screenshot.

My test results:

---

---

[typeless]

@wxiaoguang I am still unable to figure out how to reproduce it predicatably.

Strangely, it doesn't have the problem when displayed in Conversation.

[typeless]

Adding DISABLE_DIFF_HIGHLIGHT = true to app.ini can workaround the issue.

[wxiaoguang]

Is it only reproducible by your "fiscal.c" file? If so and if I can promise that I will keep your proprietary safely, is it possible to email it to me privately? (No worry if it's not suitable to share the proprietary file, that's also fine, I will try other approaches to reproduce and/or fix)

[wxiaoguang]

The most suspicious PR is this one: Full-file syntax highlighting for diff pages #33766 and a following-up fix: Fix material icon & diff highlight #33844

It rewrote the "highlight diff" logic.

[typeless]

My colleague found the C file containing a suspicious \r, which is probably the culprit.