mirror of
https://github.com/zed-industries/zed.git
synced 2026-08-24 08:24:58 +00:00
107ee1a60a
Closes https://github.com/zed-industries/zed/issues/62435 Part of https://github.com/zed-industries/zed/issues/60548 Before: https://github.com/user-attachments/assets/6b5147da-44cb-40c7-9da5-c50145e2ab4e After: https://github.com/user-attachments/assets/c58423cc-ea99-40d9-ad18-23b31dfb8e5d Previously, `TerminalPanel::load` awaited full deserialization of serialized terminals (each awaiting directory environment capture via a login shell) before the panel was registered in the dock. Until then, `terminal_panel::Toggle{Focus}` was a silent no-op: the workspace finds no panel in any dock, the keystroke is eaten, and nothing happens. When it got eventually restored, it would close whatever panel in the dock was open manually instead, wrecking the workflow. Repro: 1. Add `case "$ZSH_EXECUTION_STRING" in *--printenv*) sleep 10;; esac` to `~/.zshrc`. 2. Open a project, open at least one terminal in the panel, quit Zed (Cmd+Q). 3. Relaunch via Dock/Spotlight (not the `zed` CLI, which skips env capture via `cli_environment`). 4. Press the terminal shortcut within 10s: nothing happens; after ~10s the panel appears and the shortcut works. * `Register terminal panel before restoring serialized terminals` — the panel is now created and registered immediately, and restoration runs in panel-owned tasks (cancelled on panel drop, nothing detached). Terminal-adding paths were initially queued behind restoration (later replaced by grafting, see below); the default shell spawns only if the panel ends up active and empty after restore. * `Stop replaying serialized dock state over manual panel changes` — fixes a related race: `Dock::add_panel` replayed the serialized dock state (active panel, visibility, zoom) on every panel insertion, so a late-loading panel would re-activate the serialized panel over one the user had switched to in the meantime (e.g. the terminal panel yanking the dock away from the agent panel), or re-open a dock the user had closed. Serialized state is now applied at most once and is discarded as soon as the user changes the dock state manually. The new tests fail without this change and pass with it. * `Show restoration progress in the terminal panel and allow spawning terminals during it` — while terminals restore, the panel shows a spinner with "Restoring terminals…" instead of a blank pane, and logs the restored count and elapsed time. Supersedes the queuing from the first commit: new terminals spawn immediately, and any that land mid-restore are grafted into the restored layout instead of being lost. Serialization is paused during restoration, so quitting mid-restore can no longer persist a partial tab list and silently drop terminals. Release Notes: - Fixed the terminal panel not opening at all under certain circumstances, made panels no longer switching back to the serialized one when opened during startup. |
||
|---|---|---|
| .. | ||
| src | ||
| Cargo.toml | ||
| LICENSE-GPL | ||