zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-27 07:32:02 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix panic by preventing opening local files in a remote project (#9304)

Browse Source 
Release Notes:

- Fixed a panic caused by allowing the CLI to re-use workspaces

Co-authored-by: Marshall <marshall@zed.dev>
This commit is contained in:
Conrad Irwin 2024-03-14 11:51:33 -06:00 committed by GitHub
parent cbf960e979
commit 60044a5f56
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
crates/workspace/src/workspace.rs
View File

@ -4380,6 +4380,18 @@ fn activate_any_workspace_window(cx: &mut AsyncAppContext) -> Option<WindowHandl
.flatten()
}
fn local_workspace_windows(cx: &AppContext) -> Vec<WindowHandle<Workspace>> {
cx.windows()
.into_iter()
.filter_map(|window| window.downcast::<Workspace>())
.filter(|workspace| {
workspace
.read(cx)
.is_ok_and(|workspace| workspace.project.read(cx).is_local())
})
.collect()
}
#[derive(Default)]
pub struct OpenOptions {
pub open_new_workspace: Option<bool>,
@ -4404,20 +4416,17 @@ pub fn open_paths(
let mut open_visible = OpenVisible::All;
if open_options.open_new_workspace != Some(true) {
for window in cx.windows() {
let Some(handle) = window.downcast::<Workspace>() else {
continue;
};
if let Ok(workspace) = handle.read(cx) {
for window in local_workspace_windows(cx) {
if let Ok(workspace) = window.read(cx) {
let m = workspace
.project()
.project
.read(cx)
.visibility_for_paths(&abs_paths, cx);
if m > best_match {
existing = Some(handle);
existing = Some(window);
best_match = m;
} else if best_match.is_none() && open_options.open_new_workspace == Some(false) {
existing = Some(handle)
existing = Some(window)
}
}
}
@ -4432,8 +4441,19 @@ pub fn open_paths(
.filter_map(|result| result.ok().flatten())
.all(|file| !file.is_dir)
{
existing = activate_any_workspace_window(&mut cx);
cx.update(|cx| {
for window in local_workspace_windows(cx) {
if let Ok(workspace) = window.read(cx) {
let project = workspace.project().read(cx);
if project.is_remote() {
continue;
}
existing = Some(window);
open_visible = OpenVisible::None;
break;
}
}
})?;
}
}