Skip to content

git: Fix panic when folding ranges#48809

Merged
cole-miller merged 1 commit intomainfrom
restore-missing-sync
Feb 9, 2026
Merged

git: Fix panic when folding ranges#48809
cole-miller merged 1 commit intomainfrom
restore-missing-sync

Conversation

@cole-miller
Copy link
Member

Restore a call to BlockMap::read that went missing in #48747

Release Notes:

  • N/A

@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Feb 9, 2026
@zed-community-bot zed-community-bot bot added the staff Pull requests authored by a current member of Zed staff label Feb 9, 2026
@cole-miller cole-miller merged commit 7390b44 into main Feb 9, 2026
35 checks passed
@cole-miller cole-miller deleted the restore-missing-sync branch February 9, 2026 18:39
naaiyy added a commit to Glass-HQ/Glass that referenced this pull request Feb 16, 2026
Key changes:
- Side-by-side diff UX improvements (zed-industries#48821) - major diff view polish
- Display map refactoring - large cleanup of display_map.rs (~1000 line reduction)
- Split editor growth (zed-industries#48753) - significant expansion of split.rs
- Multi-char folds fix (zed-industries#48721)
- New multi workspace (zed-industries#47795, then reverted zed-industries#48776)
- Default view mode setting for SplittableEditor (zed-industries#48440)
- macOS drag-drop fix: reset external_files_dragged (zed-industries#48727)
- Windows: OS caption/buttons for custom titlebar (zed-industries#48330)
- Windows timer resolution guard (zed-industries#48379)
- Bedrock Claude Opus 4.6 model (zed-industries#48525)
- MCP servers: fix disabled servers disappearing after restart (zed-industries#47758)
- Shell command parser extracted to shared crate (zed-industries#48660)
- Format-on-save for streaming edit file tool (zed-industries#48663)
- Agent: insert images at cursor position (zed-industries#48779)
- Project panel: improved file/folder creation in folded paths (zed-industries#46750)
- Folding ranges panic fix (zed-industries#48809)
- REPL: shutdown all kernels on app quit (zed-industries#48760)
- Extension CI improvements
- Security updates: time v0.3.47, git2 v0.20.4

Conflict resolution:
- collab (Cargo.toml, extensions API, db, tests): deleted
- GPUI (8 files): deleted from Glass (handled in Obsydian-HQ/gpui)
- Cargo.lock: took upstream

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 staff Pull requests authored by a current member of Zed staff

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant