fix(macos): keep chat text layout contiguous to prevent streaming gap/overlap#26317
Merged
siddseethepalli merged 1 commit intoApr 18, 2026
Merged
Conversation
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: f89fbd414c
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
Contributor
Author
|
Addressed in #26457 |
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
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.
Summary
NSLayoutManager.allowsNonContiguousLayout = truefromVSelectableTextView(chat-bubble text). The measurement path uses a separate TextKit stack that lays out every glyph viaensureLayout, so the.frame(height:)we hand SwiftUI assumes the NSTextView will render every glyph in that rect. Non-contiguous layout races with streaming updates: the NSTextView briefly paints a smaller laid-out region inside the correctly-measured larger frame (visible gap between thinking block and text), and when the lazy glyphs eventually paint they can fall outside the frame into the sibling's space (interleaved-line overlap between paragraphs).VCodeView,HighlightedTextView) keep their ownallowsNonContiguousLayout = true— those solve a different scroll-view-attachment hang and don't participate in chat streaming, so the perf fix from Enable non-contiguous glyph layout for NSTextView-backed code views #26242 is preserved there.