From eca80a9b8351d39e593852e52d09182d061a4703 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Sat, 11 Apr 2026 09:25:42 -0600 Subject: [PATCH] Fix merge conflict: add cx to workspaces() call from main --- crates/zed/src/zed/open_listener.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/zed/src/zed/open_listener.rs b/crates/zed/src/zed/open_listener.rs index 7094a6a6a7addcfdb5c373258a95b2f2b02d5c2b..1372cd7d76f15222b64672ba045f7dea82f32be7 100644 --- a/crates/zed/src/zed/open_listener.rs +++ b/crates/zed/src/zed/open_listener.rs @@ -586,7 +586,7 @@ async fn maybe_prompt_open_behavior( for window in cx.windows() { if let Some(multi_workspace) = window.downcast::() { if let Ok(multi_workspace) = multi_workspace.read(cx) { - for workspace in multi_workspace.workspaces() { + for workspace in multi_workspace.workspaces(cx) { let project = workspace.read(cx).project().read(cx); if project .visibility_for_paths(&paths_as_pathbufs, false, cx)