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

Move project browser toggling logic in workspace::open_paths

Browse source
This commit is contained in:
Antonio Scandurra 2022-04-22 11:25:23 +02:00
parent bba65e120d
commit 9730213ed7
4 changed files with 26 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

22
crates/workspace/src/workspace.rs
View file

@ -31,7 +31,7 @@ pub use pane_group::*;
use postage::prelude::Stream;
use project::{fs, Fs, Project, ProjectEntryId, ProjectPath, Worktree};
use settings::Settings;
use sidebar::{Side, Sidebar, ToggleSidebarItem, ToggleSidebarItemFocus};
use sidebar::{Side, Sidebar, SidebarItemId, ToggleSidebarItem, ToggleSidebarItemFocus};
use status_bar::StatusBar;
pub use status_bar::StatusItemView;
use std::{
@ -2120,7 +2120,6 @@ pub fn open_paths(
) -> Task<(
ViewHandle<Workspace>,
Vec<Option<Result<Box<dyn ItemHandle>, Arc<anyhow::Error>>>>,
bool,
)> {
log::info!("open paths {:?}", abs_paths);
@ -2160,9 +2159,24 @@ pub fn open_paths(
let task = workspace.update(cx, |workspace, cx| {
workspace.open_paths(abs_paths.to_vec(), cx)
});
cx.spawn(|_| async move {
cx.spawn(|mut cx| async move {
let items = task.await;
(workspace, items, is_new_workspace)
let opened_dir = items.iter().any(|item| item.is_none());
// Toggle project browser when opening a new workspace that contains a directory.
if is_new_workspace && opened_dir {
workspace.update(&mut cx, |workspace, cx| {
workspace.toggle_sidebar_item(
&ToggleSidebarItem(SidebarItemId {
side: Side::Left,
item_index: 0,
}),
cx,
);
cx.focus_self();
});
}
(workspace, items)
})
}