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

remoting: Allow Add/Remove remote folder (#14532)

Browse source 
Release Notes:

- remoting (alpha only): Allow add/remove folders to projects

---------

Co-authored-by: Max <max@zed.dev>
This commit is contained in:
Conrad Irwin 2024-07-16 12:01:59 -06:00 • committed by GitHub
parent be1387fee6
commit 62ab6e1a11
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
32 changed files with 612 additions and 239 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -93,7 +93,7 @@ impl RecentProjects {
}
}
fn register(workspace: &mut Workspace, _: &mut ViewContext<Workspace>) {
fn register(workspace: &mut Workspace, cx: &mut ViewContext<Workspace>) {
workspace.register_action(|workspace, open_recent: &OpenRecent, cx| {
let Some(recent_projects) = workspace.active_modal::<Self>(cx) else {
Self::open(workspace, open_recent.create_new_window, cx);
@ -106,6 +106,20 @@ impl RecentProjects {
.update(cx, |picker, cx| picker.cycle_selection(cx))
});
});
if workspace
.project()
.read(cx)
.dev_server_project_id()
.is_some()
{
workspace.register_action(|workspace, _: &workspace::Open, cx| {
if workspace.active_modal::<Self>(cx).is_some() {
cx.propagate();
} else {
Self::open(workspace, true, cx);
}
});
}
}
pub fn open(
@ -234,7 +248,8 @@ impl PickerDelegate for RecentProjectsDelegate {
SerializedWorkspaceLocation::DevServer(dev_server_project) => {
format!(
"{}{}",
dev_server_project.dev_server_name, dev_server_project.path
dev_server_project.dev_server_name,
dev_server_project.paths.join("")
)
}
};
@ -400,7 +415,8 @@ impl PickerDelegate for RecentProjectsDelegate {
SerializedWorkspaceLocation::DevServer(dev_server_project) => {
Arc::new(vec![PathBuf::from(format!(
"{}:{}",
dev_server_project.dev_server_name, dev_server_project.path
dev_server_project.dev_server_name,
dev_server_project.paths.join(", ")
))])
}
};