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

Rebased to main

Browse source
This commit is contained in:
Mikayla Maki 2022-11-18 17:06:33 -08:00
parent a0cb6542ba
commit 992b94eef3
8 changed files with 10 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/workspace/src/persistence/model.rs
View file

@ -16,9 +16,7 @@ use sqlez::{
};
use util::ResultExt;
use crate::{
dock::DockPosition, item::ItemHandle, ItemDeserializers, Member, Pane, PaneAxis, Workspace,
};
use crate::{dock::DockPosition, ItemDeserializers, Member, Pane, PaneAxis, Workspace};
#[derive(Debug, Clone, PartialEq, Eq)]
pub struct WorkspaceId(Arc<Vec<PathBuf>>);

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

@ -677,7 +677,7 @@ impl Workspace {
cx: &mut MutableAppContext,
) -> Task<(
ViewHandle<Workspace>,
Vec<Option<Result<Box<dyn ItemHandle>, Arc<anyhow::Error>>>>,
Vec<Option<Result<Box<dyn ItemHandle>, anyhow::Error>>>,
)> {
let project_handle = Project::local(
app_state.client.clone(),
@ -740,7 +740,7 @@ impl Workspace {
Some(
workspace
.update(&mut cx, |workspace, cx| {
workspace.open_path(project_path, true, cx)
workspace.open_path(project_path, None, true, cx)
})
.await,
)