Skip to content

Use full-file highlighting for diff sections#36561

Merged
wxiaoguang merged 3 commits into
go-gitea:mainfrom
wxiaoguang:fix-diff
Feb 10, 2026
Merged

Use full-file highlighting for diff sections#36561
wxiaoguang merged 3 commits into
go-gitea:mainfrom
wxiaoguang:fix-diff

Conversation

@wxiaoguang
Copy link
Copy Markdown
Contributor

@wxiaoguang wxiaoguang commented Feb 8, 2026 •
edited
Loading

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Feb 8, 2026
@wxiaoguang
Copy link
Copy Markdown
Contributor Author

wxiaoguang commented Feb 8, 2026 •
edited
Loading

Correctly highlighted

image image image

@wxiaoguang wxiaoguang mentioned this pull request Feb 8, 2026
Closed
@wxiaoguang wxiaoguang changed the title Fix syntax highlighting in expanded diff sections Fix syntax highlighting in diff sections Feb 8, 2026
@wxiaoguang wxiaoguang mentioned this pull request Feb 8, 2026
Closed
@wxiaoguang wxiaoguang added this to the 1.26.0 milestone Feb 8, 2026
@wxiaoguang wxiaoguang added type/bug type/enhancement An improvement of existing functionality and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Feb 8, 2026
@wxiaoguang wxiaoguang changed the title Fix syntax highlighting in diff sections Use full-file highlighting for diff sections Feb 8, 2026
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Feb 8, 2026
@wxiaoguang wxiaoguang mentioned this pull request Feb 8, 2026
Merged
@wxiaoguang wxiaoguang force-pushed the fix-diff branch 9 times, most recently from 2f2e02f to d17afb8 Compare February 9, 2026 07:40
@wxiaoguang wxiaoguang requested a review from Copilot February 9, 2026 08:03

This comment was marked as resolved.

Sign in to view

@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 9, 2026
silverwind
silverwind approved these changes Feb 10, 2026
View reviewed changes
Copy link
Copy Markdown
Member

@silverwind silverwind left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested, works.

@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 10, 2026
@wxiaoguang wxiaoguang enabled auto-merge (squash) February 10, 2026 03:06
@wxiaoguang wxiaoguang merged commit 8cc8150 into go-gitea:main Feb 10, 2026
24 checks passed
@wxiaoguang wxiaoguang deleted the fix-diff branch February 10, 2026 03:44
@wxiaoguang
Copy link
Copy Markdown
Contributor Author

wxiaoguang commented Feb 10, 2026

Next: Improve diff highlighting #36583

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)
  ...
Sirherobrine23 pushed a commit to Sirherobrine23/gitea that referenced this pull request Mar 4, 2026
@wxiaoguang @Sirherobrine23
Use full-file highlighting for diff sections (go-gitea#36561)
efa8477 
* Fix go-gitea#35252
* Fix go-gitea#35999
* Improve diff rendering, don't add unnecessary "added"/"removed" tags for a full-line change
* Also fix a "space trimming" bug in go-gitea#36539 and add tests
* Use chroma "SQL" lexer instead of "MySQL" to workaround a bug (35999)
@go-gitea go-gitea locked as resolved and limited conversation to collaborators May 11, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

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. type/enhancement An improvement of existing functionality

Projects

None yet

Milestone

1.26.0

Development

Successfully merging this pull request may close these issues.

Commit/Editor diff preview for .sql files does not handle multiple line highlighting correctly Expanded diff sections have odd syntax highlighing

5 participants

@wxiaoguang @lunny @silverwind @GiteaBot