editor: Only compute word-diff highlights for visible rows - #58639
Merged
Conversation
Word diffs are stored per-hunk for the entire hunk range, but layout_word_diff_highlights converted every word diff of every hunk touching the viewport to display points each frame, even for the off-screen portion of a large, partially-visible hunk. Each conversion walks the inlay/fold/tab/wrap/block trees, so scrolling through a large modified hunk (especially in split diff mode, where both editors lay out every frame) caused frame drops proportional to the hunk's total size rather than its visible portion. Filter word diffs by the visible buffer-offset window before converting. Buffer offset to display point is order-preserving, so this is equivalent to the existing per-row filtering applied to the converted ranges. Release Notes: - Improved scrolling performance in diff views containing large hunks
cla-bot
Bot
added
the
cla-signed
zed-community-bot
Bot
added
the
staff
cole-miller
approved these changes
Jun 5, 2026
TomPlanche
pushed a commit
to TomPlanche/zed
that referenced
this pull request
Jun 8, 2026
…tries#58639) Word diffs are stored per-hunk for the entire hunk range, but layout_word_diff_highlights converted every word diff of every hunk touching the viewport to display points each frame, even for the off-screen portion of a large, partially-visible hunk. Each conversion walks the inlay/fold/tab/wrap/block trees, so scrolling through a large modified hunk (especially in split diff mode, where both editors lay out every frame) caused frame drops proportional to the hunk's total size rather than its visible portion. Filter word diffs by the visible buffer-offset window before converting. Buffer offset to display point is order-preserving, so this is equivalent to the existing per-row filtering applied to the converted ranges. Release Notes: - Improved scrolling performance in diff views containing large hunks with many computed word diffs
This was referenced Jun 18, 2026
Closed
This was referenced Jul 1, 2026
This was referenced Jul 10, 2026
jonx
pushed a commit
to jonx/zed-aros
that referenced
this pull request
Jul 17, 2026
…tries#58639) Word diffs are stored per-hunk for the entire hunk range, but layout_word_diff_highlights converted every word diff of every hunk touching the viewport to display points each frame, even for the off-screen portion of a large, partially-visible hunk. Each conversion walks the inlay/fold/tab/wrap/block trees, so scrolling through a large modified hunk (especially in split diff mode, where both editors lay out every frame) caused frame drops proportional to the hunk's total size rather than its visible portion. Filter word diffs by the visible buffer-offset window before converting. Buffer offset to display point is order-preserving, so this is equivalent to the existing per-row filtering applied to the converted ranges. Release Notes: - Improved scrolling performance in diff views containing large hunks with many computed word diffs
jolutz
pushed a commit
to jolutz/zed
that referenced
this pull request
Aug 8, 2026
…tries#58639) Word diffs are stored per-hunk for the entire hunk range, but layout_word_diff_highlights converted every word diff of every hunk touching the viewport to display points each frame, even for the off-screen portion of a large, partially-visible hunk. Each conversion walks the inlay/fold/tab/wrap/block trees, so scrolling through a large modified hunk (especially in split diff mode, where both editors lay out every frame) caused frame drops proportional to the hunk's total size rather than its visible portion. Filter word diffs by the visible buffer-offset window before converting. Buffer offset to display point is order-preserving, so this is equivalent to the existing per-row filtering applied to the converted ranges. Release Notes: - Improved scrolling performance in diff views containing large hunks with many computed word diffs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Word diffs are stored per-hunk for the entire hunk range, but layout_word_diff_highlights converted every word diff of every hunk touching the viewport to display points each frame, even for the off-screen portion of a large, partially-visible hunk. Each conversion walks the inlay/fold/tab/wrap/block trees, so scrolling through a large modified hunk (especially in split diff mode, where both editors lay out every frame) caused frame drops proportional to the hunk's total size rather than its visible portion.
Filter word diffs by the visible buffer-offset window before converting. Buffer offset to display point is order-preserving, so this is equivalent to the existing per-row filtering applied to the converted ranges.
Release Notes: