From 6ee0d104d68ebe33757427b62d03f09cc0e90a3e Mon Sep 17 00:00:00 2001
From: Mikayla Maki <mikayla.c.maki@gmail.com>
Date: Fri, 21 Apr 2023 10:08:52 -0700
Subject: [PATCH] Fix panic in remove active item

---
 crates/workspace/src/pane.rs | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/crates/workspace/src/pane.rs b/crates/workspace/src/pane.rs
index c394ae4631..089618ea20 100644
--- a/crates/workspace/src/pane.rs
+++ b/crates/workspace/src/pane.rs
@@ -785,6 +785,10 @@ impl Pane {
     ) -> Option<Task<Result<()>>> {
         let pane_handle = workspace.active_pane().clone();
         let pane = pane_handle.read(cx);
+
+        if pane.items.is_empty() {
+            return Some(Task::Ready(Some(Ok(()))));
+        }
         let active_item_id = pane.items[pane.active_item_index].id();
 
         let task = Self::close_item_by_id(workspace, pane_handle, active_item_id, cx);
@@ -2098,6 +2102,21 @@ mod tests {
     use gpui::{executor::Deterministic, TestAppContext};
     use project::FakeFs;
 
+    #[gpui::test]
+    async fn test_remove_active_empty(cx: &mut TestAppContext) {
+        Settings::test_async(cx);
+        let fs = FakeFs::new(cx.background());
+
+        let project = Project::test(fs, None, cx).await;
+        let (_, workspace) = cx.add_window(|cx| Workspace::test_new(project.clone(), cx));
+
+        let task = workspace.update(cx, |workspace, cx| {
+            Pane::close_active_item(workspace, &CloseActiveItem, cx).unwrap()
+        });
+
+        assert!(task.await.is_ok())
+    }
+
     #[gpui::test]
     async fn test_add_item_with_new_item(cx: &mut TestAppContext) {
         cx.foreground().forbid_parking();