Skip to content

project_panel: Fix collapse_all_entries collapsing single worktree root completely#48443

Merged
smitbarmase merged 1 commit intomainfrom
fix-collapse-all-entries-invisible-worktree
Feb 5, 2026
Merged

project_panel: Fix collapse_all_entries collapsing single worktree root completely#48443
smitbarmase merged 1 commit intomainfrom
fix-collapse-all-entries-invisible-worktree

Conversation

@smitbarmase
Copy link
Member

@smitbarmase smitbarmase commented Feb 5, 2026

For: #47328

Release Notes:

  • Fixed an issue where selecting "Collapse All" on the root directory or triggering the collapse all action would sometimes collapse the entire root instead of keeping it expanded when there's a single worktree.

@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Feb 5, 2026
@smitbarmase smitbarmase force-pushed the fix-collapse-all-entries-invisible-worktree branch from 30c05ff to 51646d8 Compare February 5, 2026 05:50
@smitbarmase smitbarmase force-pushed the fix-collapse-all-entries-invisible-worktree branch from 51646d8 to a01705d Compare February 5, 2026 06:06
@smitbarmase smitbarmase merged commit 12091a9 into main Feb 5, 2026
27 checks passed
@smitbarmase smitbarmase deleted the fix-collapse-all-entries-invisible-worktree branch February 5, 2026 06:13
rtfeldman pushed a commit that referenced this pull request Feb 5, 2026
…ot completely (#48443)

For: #47328

Release Notes:

- Fixed an issue where selecting "Collapse All" on the root directory or
triggering the collapse all action would sometimes collapse the entire
root instead of keeping it expanded when there's a single worktree.
naaiyy added a commit to Glass-HQ/Glass that referenced this pull request Feb 16, 2026
Key changes:
- Thermal state detection (zed-industries#45638) - GPUI detects system thermal state, throttles to ~60fps when overheating
- Checkerboard shader for side-by-side diff (zed-industries#48417) - visual pattern for diff backgrounds
- cosmic-text v0.17 (zed-industries#48504) - fixes font ligatures on Linux
- Middle click tab close (zed-industries#44916) - on_aux_click/is_middle_click API additions
- Soft wrap modes for wrap width (zed-industries#46422)
- Tab switcher mode similar to vim/helix buffer picker (zed-industries#47079)
- Multi_buffer optimization batch (zed-industries#48519)
- TreeMap for diagnostics (zed-industries#48482) - performance improvement
- Semantic token follow-up fixes (zed-industries#48485)
- Claude Opus 4.6 and 1M context window model variants (zed-industries#48508)
- Anthropic adaptive thinking types (zed-industries#48517)
- Side-by-side diff: hunk gutter highlights restored, toolbar buttons for SplittableEditor
- Shell quote bypass fix in terminal permission system (zed-industries#48436)
- Project panel: Collapse All improvements (zed-industries#47328, zed-industries#48443)
- Edit prediction: trailing newlines fix, cursor position in global coords
- Properly discard tokens on language server stop (zed-industries#48490)
- AgentTool::NAME const instead of hardcoded strings (zed-industries#48506)

Conflict resolution:
- collab/editor_tests.rs: deleted (collab removed)
- vim (helix, motion, increment): deleted (vim removed)
- GPUI (17 files): deleted from Glass (handled in Obsydian-HQ/gpui)
- editor/items.rs: merged imports (added BufferId, kept Theme)
- project_diff.rs: removed old native_button toggle (upstream uses toolbar buttons now)
- lsp_store.rs: added SemanticTokenConfig, removed GlobalLogStore/LanguageServerKind
- project_panel.rs: merged UI imports (added ContextMenuEntry, ScrollAxes)
- Keymaps: took upstream JetBrains bindings

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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