Skip to content

settings_ui: Stop reading the clipboard on every frame (#56075) (cherry-pick to preview) - #56093

Merged
zed-zippy[bot] merged 1 commit into
v1.2.xfrom
cherry-pick-v1.2.x-8bdcce86
May 7, 2026
Merged

settings_ui: Stop reading the clipboard on every frame (#56075) (cherry-pick to preview)#56093
zed-zippy[bot] merged 1 commit into
v1.2.xfrom
cherry-pick-v1.2.x-8bdcce86

Conversation

@zed-zippy

@zed-zippy zed-zippy Bot commented May 7, 2026

Copy link
Copy Markdown
Contributor

Cherry-pick of #56075 to preview


render_settings_item_link was calling cx.read_from_clipboard()
during render so it could show a check icon next to the copy-link button
when the matching link was on the clipboard. This had two problems:

  • A clipboard read per visible setting per frame is too expensive.
  • On Windows, reading the clipboard pumps the system message queue. If a
    queued message handler updates App while we're still rendering, GPUI
    panics with RefCell already borrowed (many occurrences observed).

Track the json_path of the most recently copied setting locally
instead. The check icon now reflects what was copied in this session via
this UI rather than whatever is on the system clipboard.

While this removes the most common offender, the underlying
gpui_windows reentrancy bug still exists: on_close /
on_request_frame callbacks can be invoked while App is already
borrowed on Windows, and can be triggered by any other
clipboard-touching code path. We should consider a follow-up PR that
handles this at the platform layer -- either by deferring callbacks that
re-borrow App, or by guarding individual handlers in
gpui_windows::events against reentrant borrow_mut calls.

Self-Review Checklist:

  • I've reviewed my own diff for quality, security, and reliability
  • Unsafe blocks (if any) have justifying comments
  • The content is consistent with the UI/UX
    checklist
  • Tests cover the new/changed behavior
  • Performance impact has been considered and is acceptable

Release Notes:

  • Fixed a crash on Windows that could occur when closing the settings
    window
  • Improved the overall performance of the settings window

`render_settings_item_link` was calling `cx.read_from_clipboard()`
during render so it could show a check icon next to the copy-link button
when the matching link was on the clipboard. This had two problems:

- A clipboard read per visible setting per frame is too expensive.
- On Windows, reading the clipboard pumps the system message queue. If a
queued message handler updates `App` while we're still rendering, GPUI
panics with `RefCell already borrowed` (many occurrences observed).

Track the `json_path` of the most recently copied setting locally
instead. The check icon now reflects what was copied in this session via
this UI rather than whatever is on the system clipboard.

While this removes the most common offender, the underlying
`gpui_windows` reentrancy bug still exists: `on_close` /
`on_request_frame` callbacks can be invoked while `App` is already
borrowed on Windows, and can be triggered by any other
clipboard-touching code path. We should consider a follow-up PR that
handles this at the platform layer -- either by deferring callbacks that
re-borrow `App`, or by guarding individual handlers in
`gpui_windows::events` against reentrant `borrow_mut` calls.

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- Fixed a crash on Windows that could occur when closing the settings
window
- Improved the overall performance of the settings window
@cla-bot cla-bot Bot added the cla-signed The user has signed the Contributor License Agreement label May 7, 2026
@zed-community-bot zed-community-bot Bot added the bot Pull requests authored by a bot label May 7, 2026
@zed-zippy
zed-zippy Bot merged commit 6c6d780 into v1.2.x May 7, 2026
39 checks passed
@zed-zippy
zed-zippy Bot deleted the cherry-pick-v1.2.x-8bdcce86 branch May 7, 2026 20:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bot Pull requests authored by a bot cla-signed The user has signed the Contributor License Agreement

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant