Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

Fix remote windows merging during session restoration (#66289)

buvidk12347a349ce42df2
diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index 391b202b453..268e4423054 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -1456,7 +1456,12 @@ pub(crate) async fn restore_or_create_workspace(
connection_options,
paths,
app_state.clone(),
- workspace::OpenOptions::default(),
+ workspace::OpenOptions {
+ // Each saved window must retain its own project roots,
+ // even when some roots also appear in another window.
+ workspace_matching: workspace::WorkspaceMatching::None,
+ ..Default::default()
+ },
cx,
)
.await?;