Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

workspace: Clean up empty panes left over from file opening failures (#34908)

Browse source 
Closes #34583

Release Notes:

- Fixed empty pane being left after a binary file is dropped into a new
pane.s
This commit is contained in:
Piotr Osiewicz 2025-07-22 18:52:17 +02:00 • committed by GitHub
parent 64d0fec699
commit caa520c499
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 25 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3239,28 +3239,37 @@ impl Pane {
split_direction = None;
}
if let Ok(open_task) = workspace.update_in(cx, |workspace, window, cx| {
if let Some(split_direction) = split_direction {
to_pane = workspace.split_pane(to_pane, split_direction, window, cx);
}
workspace.open_paths(
paths,
OpenOptions {
visible: Some(OpenVisible::OnlyDirectories),
..Default::default()
},
Some(to_pane.downgrade()),
window,
cx,
)
}) {
if let Ok((open_task, to_pane)) =
workspace.update_in(cx, |workspace, window, cx| {
if let Some(split_direction) = split_direction {
to_pane =
workspace.split_pane(to_pane, split_direction, window, cx);
}
(
workspace.open_paths(
paths,
OpenOptions {
visible: Some(OpenVisible::OnlyDirectories),
..Default::default()
},
Some(to_pane.downgrade()),
window,
cx,
),
to_pane,
)
})
{
let opened_items: Vec<_> = open_task.await;
_ = workspace.update(cx, |workspace, cx| {
_ = workspace.update_in(cx, |workspace, window, cx| {
for item in opened_items.into_iter().flatten() {
if let Err(e) = item {
workspace.show_error(&e, cx);
}
}
if to_pane.read(cx).items_len() == 0 {
workspace.remove_pane(to_pane, None, window, cx);
}
});
}
})