Skip to content

Fix code highlighting on blame page#36157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
lafriks merged 1 commit into from
Dec 14, 2025
Merged

Fix code highlighting on blame page #36157

lafriks merged 1 commit into from
Dec 14, 2025
+109 −92

Conversation

@wxiaoguang
Copy link
Contributor

@wxiaoguangwxiaoguang commented Dec 14, 2025•
edited
Loading

  1. Full file highlighting (fix the legacy todo "we should instead highlight the whole file at once")
  2. Correctly covert file content encoding
  3. Remove dead code, split large for-loop into small functions/blocks to make code maintainable

@GiteaBotGiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Dec 14, 2025
@github-actionsgithub-actionsbot added modifies/go Pull requests that update Go code modifies/templates This PR modifies the template files labels Dec 14, 2025
@wxiaoguangwxiaoguang mentioned this pull request Dec 14, 2025
Closed
@wxiaoguangwxiaoguang mentioned this pull request Dec 14, 2025
Closed
@GiteaBotGiteaBot 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 Dec 14, 2025
@GiteaBotGiteaBot 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 Dec 14, 2025
@lafrikslafriks merged commit 7190519 into go-gitea:mainDec 14, 2025
23 checks passed
@GiteaBotGiteaBot added this to the 1.26.0 milestone Dec 14, 2025
@wxiaoguangwxiaoguang deleted the fix-blame-highlight branch December 14, 2025 11:00
zjjhot added a commit to zjjhot/gitea that referenced this pull request Dec 15, 2025
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
df53846
* giteaofficial/main: Remove undocumented support of signing key in the repository git configuration file (go-gitea#36143) Enable gocheckcompilerdirectives linter (go-gitea#36156) Fix code highlighting on blame page (go-gitea#36157) Check user visibility when redirecting to a renamed user (go-gitea#36148) Fix bug when viewing the commit diff page with non-ANSI files (go-gitea#36149) Refactor `FileTreeItem` type (go-gitea#36137) Fix various bugs (go-gitea#36139) Fix issue close timeline icon (go-gitea#36138) Add permissions to`files-changed` jobs (go-gitea#36142) Add explicit permissions to all actions workflows (go-gitea#36140) Bump `actions/checkout` to v6 (go-gitea#36136) Hide RSS icon when viewing a file not under a branch (go-gitea#36135) Fix SVG size calulation, only use `style` attribute (go-gitea#36133) Add sorting/filtering to admin user search API endpoint (go-gitea#36112)
silverwind added a commit to silverwind/gitea that referenced this pull request Dec 16, 2025
@silverwind
Merge remote-tracking branch 'origin/main' into deps-105
a0b6c75
* origin/main: fix webAuthn insecure error view (go-gitea#36165) Some small refactors (go-gitea#36163) Remove undocumented support of signing key in the repository git configuration file (go-gitea#36143) Enable gocheckcompilerdirectives linter (go-gitea#36156) Fix code highlighting on blame page (go-gitea#36157) Check user visibility when redirecting to a renamed user (go-gitea#36148) Fix bug when viewing the commit diff page with non-ANSI files (go-gitea#36149)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lunnylunnylunny approved these changes

@lafrikslafrikslafriks approved these changes

Assignees

No one assigned

Labels

lgtm/doneThis PR has enough approvals to get merged. There are no important open reservations anymore.modifies/frontendmodifies/goPull requests that update Go codemodifies/templatesThis PR modifies the template files

Projects

None yet

Milestone

1.26.0

Development

Successfully merging this pull request may close these issues.

Syntax highlighting in blame mode broken (or different from normal mode) for some files

4 participants

@wxiaoguang@lunny@lafriks@GiteaBot