workspace: Sanitize pinned tab count before usage (cherry-pick #21417) (#21422)

gcp-cherry-pick-bot[bot] and Piotr Osiewicz created 1 year ago

Cherry-picked workspace: Sanitize pinned tab count before usage (#21417)

Fixes all sorts of panics around usage of incorrect pinned tab count
that has been fixed in app itself, yet persists in user db.

Closes #ISSUE

Release Notes:

- N/A

Co-authored-by: Piotr Osiewicz <[e-mail]>

Change summary

crates/workspace/src/pane.rs              | 2 +-
crates/workspace/src/persistence/model.rs | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

Detailed changes

crates/workspace/src/pane.rs

@@ -1870,7 +1870,7 @@ impl Pane {
     fn unpin_tab_at(&mut self, ix: usize, cx: &mut ViewContext<'_, Self>) {
         maybe!({
             let pane = cx.view().clone();
-            self.pinned_tab_count = self.pinned_tab_count.checked_sub(1).unwrap();
+            self.pinned_tab_count = self.pinned_tab_count.checked_sub(1)?;
             let destination_index = self.pinned_tab_count;
 
             let id = self.item_for_index(ix)?.item_id();

crates/workspace/src/persistence/model.rs

@@ -473,7 +473,7 @@ impl SerializedPane {
             })?;
         }
         pane.update(cx, |pane, _| {
-            pane.set_pinned_count(self.pinned_count);
+            pane.set_pinned_count(self.pinned_count.min(items.len()));
         })?;
 
         anyhow::Ok(items)