Skip to content

Improve diff highlighting#36583

Merged
wxiaoguang merged 2 commits intogo-gitea:mainfrom
wxiaoguang:fix-diff-highlight
Feb 11, 2026
Merged

Improve diff highlighting#36583
wxiaoguang merged 2 commits intogo-gitea:mainfrom
wxiaoguang:fix-diff-highlight

Conversation

@wxiaoguang
Copy link
Copy Markdown
Contributor

@wxiaoguang wxiaoguang commented Feb 10, 2026

Fix more edge cases. Now the result for single-line diff should be almost perfect.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Feb 10, 2026
@github-actions github-actions bot added the modifies/go Pull requests that update Go code label Feb 10, 2026
@wxiaoguang
Copy link
Copy Markdown
Contributor Author

wxiaoguang commented Feb 10, 2026

Before:

image

After, the changed parts are correctly highlighted:

image

@wxiaoguang wxiaoguang mentioned this pull request Feb 10, 2026
Merged
@wxiaoguang wxiaoguang requested a review from Copilot February 10, 2026 17:11

This comment was marked as resolved.

Sign in to view

@wxiaoguang wxiaoguang added this to the 1.26.0 milestone Feb 10, 2026
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Feb 10, 2026
@silverwind
Copy link
Copy Markdown
Member

silverwind commented Feb 11, 2026 •
edited
Loading

I find it a bit odd that we have to do these word-level highlighting heuristics in first-party code but apparently there's just no good golang lib around. https://github.com/dandavison/delta exists, but it's rust only.

@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Feb 11, 2026
@wxiaoguang
Copy link
Copy Markdown
Contributor Author

wxiaoguang commented Feb 11, 2026 •
edited
Loading

I find it a bit odd that we have to do these word-level highlighting heuristics in first-party code but apparently there's just no good golang lib around. https://github.com/dandavison/delta exists, but it's rust only.

They are not able to handle full file highlight like https://github.com/dandavison/delta/issues/1207#issuecomment-1475285335, https://github.com/dandavison/delta/issues/117

@wxiaoguang wxiaoguang enabled auto-merge (squash) February 11, 2026 03:46
@wxiaoguang wxiaoguang added the type/enhancement An improvement of existing functionality label Feb 11, 2026
@wxiaoguang wxiaoguang merged commit 3754e9d into go-gitea:main Feb 11, 2026
24 checks passed
@silverwind silverwind deleted the fix-diff-highlight branch February 11, 2026 04:06
@wxiaoguang
Copy link
Copy Markdown
Contributor Author

wxiaoguang commented Feb 11, 2026

One more: Fine tune diff highlighting #36592

silverwind added a commit to silverwind/gitea that referenced this pull request Feb 12, 2026
@silverwind
Merge remote-tracking branch 'origin/main' into dropdowncss
a4d46ca 
* origin/main: (34 commits)
  Fine tune diff highlighting (go-gitea#36592)
  Add code editor setting dropdowns (go-gitea#36534)
  Update to go 1.26.0 and golangci-lint 2.9.0 (go-gitea#36588)
  Improve diff highlighting (go-gitea#36583)
  Fix markup code block layout (go-gitea#36578)
  Remove striped tables in UI (go-gitea#36509)
  Fix vertical alignment of `.commit-sign-badge` children (go-gitea#36570)
  Fix mirror sync parser and fix mirror messages (go-gitea#36504)
  Update JS and PY deps (go-gitea#36576)
  Add viewer controller for mermaid (zoom, drag) (go-gitea#36557)
  Misc typescript tweaks (go-gitea#36523)
  Use full-file highlighting for diff sections (go-gitea#36561)
  fix(diff): reprocess htmx content after loading more files (go-gitea#36568)
  [skip ci] Updated translations via Crowdin
  Add wrap to runner label list (go-gitea#36565)
  fix: add dnf5 command for Fedora in RPM package instructions (go-gitea#36527)
  Enable pagination on GiteaDownloader.getIssueReactions() (go-gitea#36549)
  Refactor merge conan and container auth preserve actions taskID (go-gitea#36560)
  Fix assignee sidebar links and empty placeholder after go-gitea#32465 refactor (go-gitea#36559)
  Fix various version parsing problems (go-gitea#36553)
  ...
silverwind added a commit to silverwind/gitea that referenced this pull request Feb 12, 2026
@silverwind
Merge remote-tracking branch 'origin/main' into reltime
9108450 
* origin/main: (152 commits)
  Fine tune diff highlighting (go-gitea#36592)
  Add code editor setting dropdowns (go-gitea#36534)
  Update to go 1.26.0 and golangci-lint 2.9.0 (go-gitea#36588)
  Improve diff highlighting (go-gitea#36583)
  Fix markup code block layout (go-gitea#36578)
  Remove striped tables in UI (go-gitea#36509)
  Fix vertical alignment of `.commit-sign-badge` children (go-gitea#36570)
  Fix mirror sync parser and fix mirror messages (go-gitea#36504)
  Update JS and PY deps (go-gitea#36576)
  Add viewer controller for mermaid (zoom, drag) (go-gitea#36557)
  Misc typescript tweaks (go-gitea#36523)
  Use full-file highlighting for diff sections (go-gitea#36561)
  fix(diff): reprocess htmx content after loading more files (go-gitea#36568)
  [skip ci] Updated translations via Crowdin
  Add wrap to runner label list (go-gitea#36565)
  fix: add dnf5 command for Fedora in RPM package instructions (go-gitea#36527)
  Enable pagination on GiteaDownloader.getIssueReactions() (go-gitea#36549)
  Refactor merge conan and container auth preserve actions taskID (go-gitea#36560)
  Fix assignee sidebar links and empty placeholder after go-gitea#32465 refactor (go-gitea#36559)
  Fix various version parsing problems (go-gitea#36553)
  ...
silverwind added a commit to silverwind/gitea that referenced this pull request Feb 14, 2026
@silverwind
Merge remote-tracking branch 'origin/main' into xfo
d5f17b4 
* origin/main: (2555 commits)
  automate updating nix flakes (go-gitea#35641)
  Update AGENTS.md instructions (go-gitea#36627)
  use user id in noreply emails (go-gitea#36550)
  feat(db): Improve BuildCaseInsensitiveLike with lowercase (go-gitea#36598)
  [skip ci] Updated translations via Crowdin
  BUG: Fix workflow run jobs API returning null steps (go-gitea#36603)
  Refactor highlight and diff (go-gitea#36599)
  Fix bug when do LFS GC (go-gitea#36500)
  feature to be able to filter project boards by milestones (go-gitea#36321)
  Update emoji data for Unicode 16 (go-gitea#36596)
  Adapt monaco error matching pattern to recent webpack config change (go-gitea#36533)
  Fix a bug user could change another user's primary email (go-gitea#36586)
  fix(repo-editor): disable Monaco `editContext` to avoid bugs with lost focus (go-gitea#36585)
  Fine tune diff highlighting (go-gitea#36592)
  Add code editor setting dropdowns (go-gitea#36534)
  Update to go 1.26.0 and golangci-lint 2.9.0 (go-gitea#36588)
  Improve diff highlighting (go-gitea#36583)
  Fix markup code block layout (go-gitea#36578)
  Remove striped tables in UI (go-gitea#36509)
  Fix vertical alignment of `.commit-sign-badge` children (go-gitea#36570)
  ...

# Conflicts:
#	custom/conf/app.example.ini
#	docs/content/administration/config-cheat-sheet.en-us.md
#	docs/content/administration/config-cheat-sheet.zh-cn.md
#	modules/setting/security.go
#	routers/common/errpage.go
#	services/context/api.go
#	services/context/context.go
Sirherobrine23 pushed a commit to Sirherobrine23/gitea that referenced this pull request Mar 4, 2026
@wxiaoguang @Sirherobrine23
Improve diff highlighting (go-gitea#36583)
03ddd7e
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

Copilot code review Copilot Copilot left review comments

@lunny lunny lunny approved these changes

@silverwind silverwind silverwind approved these changes

Assignees

No one assigned

Labels

lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/go Pull requests that update Go code type/enhancement An improvement of existing functionality

Projects

None yet

Milestone

1.26.0

Development

Successfully merging this pull request may close these issues.

5 participants

@wxiaoguang @silverwind @lunny @GiteaBot