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.

zed: Fix local files not opening with focus on remote workspaces (#56373)

Lukas Wirth1107bc8b092b
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index 1e27eb3f138..90e497eb4e2 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -1290,11 +1290,17 @@ pub enum Event {
WorktreeCreationChanged,
}
+/// Controls which types of items should be made visible in the project panel
+/// when opened.
#[derive(Debug, Clone)]
pub enum OpenVisible {
+ /// Make all opened items visible (both files and directories).
All,
+ /// Don't make any opened items visible.
None,
+ /// Only make opened files visible, not directories.
OnlyFiles,
+ /// Only make opened directories visible, not files.
OnlyDirectories,
}
@@ -2104,7 +2110,7 @@ impl Workspace {
})
.log_err();
- if open_mode == OpenMode::NewWindow {
+ if open_mode == OpenMode::NewWindow || open_mode == OpenMode::Activate {
window
.update(cx, |_, window, _cx| {
window.activate_window();
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index 180d85440df..8e5c04654a5 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -2356,12 +2356,12 @@ fn open_settings_file(
cx: &mut Context<Workspace>,
) {
cx.spawn_in(window, async move |workspace, cx| {
- let (worktree_creation_task, settings_open_task) = workspace
+ workspace
.update_in(cx, |workspace, window, cx| {
workspace.with_local_or_wsl_workspace(window, cx, move |workspace, window, cx| {
let project = workspace.project().clone();
- let worktree_creation_task = cx.spawn_in(window, async move |_, cx| {
+ cx.spawn_in(window, async move |workspace, cx| {
let config_dir = project
.update(cx, |project, cx| {
project.try_windows_path_to_wsl(paths::config_dir().as_path(), cx)
@@ -2376,20 +2376,23 @@ fn open_settings_file(
// drag and drop from OS) still have their worktrees
// released on file close, causing LSP servers'
// restarts.
- project
+ let (_worktree, _) = project
.update(cx, |project, cx| {
project.find_or_create_worktree(&config_dir, false, cx)
})
- .await
- });
- let settings_open_task =
- create_and_open_local_file(abs_path, window, cx, default_content);
- (worktree_creation_task, settings_open_task)
+ .await?;
+
+ workspace
+ .update_in(cx, |_, window, cx| {
+ create_and_open_local_file(abs_path, window, cx, default_content)
+ })?
+ .await?;
+ anyhow::Ok(())
+ })
})
})?
+ .await?
.await?;
- let _ = worktree_creation_task.await?;
- let _ = settings_open_task.await?;
anyhow::Ok(())
})
.detach_and_log_err(cx);