Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
zed: Respect `default_open_behavior` when opening file from Finder (#59661)
Bennet Bo Fenner52b61cf424b3
diff --git a/crates/zed/src/zed/open_listener.rs b/crates/zed/src/zed/open_listener.rsindex a992dfe4fd9..fd0705d5d94 100644--- a/crates/zed/src/zed/open_listener.rs+++ b/crates/zed/src/zed/open_listener.rs@@ -750,9 +750,13 @@ pub(crate) fn open_options_for_request(location: &SerializedWorkspaceLocation,cx: &App,) -> workspace::OpenOptions {- open_behavior.map_or_else(workspace::OpenOptions::default, |open_behavior| {- open_options_for_behavior(open_behavior, location, cx)- })+ let open_behavior = open_behavior.unwrap_or_else(|| {+ match workspace::WorkspaceSettings::get_global(cx).default_open_behavior {+ settings::DefaultOpenBehavior::ExistingWindow => cli::OpenBehavior::ExistingWindow,+ settings::DefaultOpenBehavior::NewWindow => cli::OpenBehavior::PreferNewWindow,+ }+ });+ open_options_for_behavior(open_behavior, location, cx)}pub(crate) fn open_options_for_behavior(@@ -1364,6 +1368,48 @@ mod tests {assert!(options.requesting_window.is_none());}+ #[gpui::test]+ fn test_open_options_for_request_respects_default_open_behavior(cx: &mut TestAppContext) {+ use gpui::UpdateGlobal as _;++ let _app_state = init_test(cx);++ // A `None` behavior (e.g. a Finder or URL open) consults the UI-level+ // `default_open_behavior` setting rather than falling back to fixed+ // defaults.+ cx.update(|cx| {+ settings::SettingsStore::update_global(cx, |store, cx| {+ store.update_user_settings(cx, |settings| {+ settings.workspace.default_open_behavior =+ Some(settings::DefaultOpenBehavior::NewWindow);+ });+ });+ });+ let options =+ cx.update(|cx| open_options_for_request(None, &SerializedWorkspaceLocation::Local, cx));+ assert_eq!(+ options.workspace_matching,+ workspace::WorkspaceMatching::MatchSubpaths+ );+ assert!(!options.add_dirs_to_sidebar);++ cx.update(|cx| {+ settings::SettingsStore::update_global(cx, |store, cx| {+ store.update_user_settings(cx, |settings| {+ settings.workspace.default_open_behavior =+ Some(settings::DefaultOpenBehavior::ExistingWindow);+ });+ });+ });+ let options =+ cx.update(|cx| open_options_for_request(None, &SerializedWorkspaceLocation::Local, cx));+ assert_eq!(+ options.workspace_matching,+ workspace::WorkspaceMatching::MatchExact+ );+ assert!(options.add_dirs_to_sidebar);+ }+#[gpui::test]fn test_parse_agent_url(cx: &mut TestAppContext) {let _app_state = init_test(cx);