mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-02-07 11:11:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Add guards to other pane index removals

Browse source
This commit is contained in:
Mikayla Maki 2023-05-19 15:10:29 -07:00
parent 7d1833b759
commit c193b0b8fc
No known key found for this signature in database
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
crates/workspace/src/pane.rs
View file

@ -711,10 +711,7 @@ impl Pane {
let pane_handle = workspace.active_pane().clone(); let pane_handle = workspace.active_pane().clone();
let pane = pane_handle.read(cx); let pane = pane_handle.read(cx);
if pane.items.is_empty() { let active_item_id = pane.items.get(pane.active_item_index)?.id();
return None;
}
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); let task = Self::close_item_by_id(workspace, pane_handle, active_item_id, cx);
@ -742,7 +739,8 @@ impl Pane {
) -> Option<Task<Result<()>>> { ) -> Option<Task<Result<()>>> {
let pane_handle = workspace.active_pane().clone(); let pane_handle = workspace.active_pane().clone();
let pane = pane_handle.read(cx); let pane = pane_handle.read(cx);
let active_item_id = pane.items[pane.active_item_index].id();
let active_item_id = pane.items.get(pane.active_item_index)?.id();
let task = Self::close_items(workspace, pane_handle, cx, move |item_id| { let task = Self::close_items(workspace, pane_handle, cx, move |item_id| {
item_id != active_item_id item_id != active_item_id
@ -785,7 +783,7 @@ impl Pane {
) -> Option<Task<Result<()>>> { ) -> Option<Task<Result<()>>> {
let pane_handle = workspace.active_pane().clone(); let pane_handle = workspace.active_pane().clone();
let pane = pane_handle.read(cx); let pane = pane_handle.read(cx);
let active_item_id = pane.items[pane.active_item_index].id(); let active_item_id = pane.items.get(pane.active_item_index)?.id();
let task = Self::close_items_to_the_left_by_id(workspace, pane_handle, active_item_id, cx); let task = Self::close_items_to_the_left_by_id(workspace, pane_handle, active_item_id, cx);
@ -825,7 +823,7 @@ impl Pane {
) -> Option<Task<Result<()>>> { ) -> Option<Task<Result<()>>> {
let pane_handle = workspace.active_pane().clone(); let pane_handle = workspace.active_pane().clone();
let pane = pane_handle.read(cx); let pane = pane_handle.read(cx);
let active_item_id = pane.items[pane.active_item_index].id(); let active_item_id = pane.items.get(pane.active_item_index)?.id();
let task = Self::close_items_to_the_right_by_id(workspace, pane_handle, active_item_id, cx); let task = Self::close_items_to_the_right_by_id(workspace, pane_handle, active_item_id, cx);