multi_buffer: Work around another panic bug in path_key (#42920)

Fixes ZED-346 for now until I find the time to dig into this bug
properly

Release Notes:

- Fixed a panic in the diagnostics pane
This commit is contained in:
Lukas Wirth
2025-11-17 22:38:48 +00:00
committed by GitHub
parent 6bea23e990
commit 2c7bcfcb7b
2 changed files with 9 additions and 5 deletions
+5 -3
View File
@@ -288,7 +288,6 @@ impl MultiBuffer {
.get(&path)
.cloned()
.unwrap_or_default();
let mut new_iter = new.into_iter().peekable();
let mut existing_iter = existing.into_iter().peekable();
@@ -413,14 +412,17 @@ impl MultiBuffer {
// todo(lw): There is a logic bug somewhere that causes the to_remove vector to be not ordered correctly
to_remove.sort_by_cached_key(|&id| snapshot.excerpt_locator_for_id(id));
self.remove_excerpts(to_remove, cx);
if excerpt_ids.is_empty() {
self.excerpts_by_path.remove(&path);
} else {
for excerpt_id in &excerpt_ids {
self.paths_by_excerpt.insert(*excerpt_id, path.clone());
}
self.excerpts_by_path
.insert(path, excerpt_ids.iter().dedup().cloned().collect());
let snapshot = &*self.snapshot.get_mut();
let mut excerpt_ids: Vec<_> = excerpt_ids.iter().dedup().cloned().collect();
excerpt_ids.sort_by_cached_key(|&id| snapshot.excerpt_locator_for_id(id));
self.excerpts_by_path.insert(path, excerpt_ids);
}
(excerpt_ids, added_a_new_excerpt)