mirror of
https://github.com/zed-industries/zed.git
synced 2024-10-27 08:50:29 +00:00
Fix panic in remove active item
This commit is contained in:
parent
1fa52adabd
commit
6ee0d104d6
1 changed files with 19 additions and 0 deletions
|
@ -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();
|
||||
|
|
Loading…
Reference in a new issue