From ee0bbdfe10da18d3f65e59e0a92e3cc5a76f0452 Mon Sep 17 00:00:00 2001 From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com> Date: Mon, 16 Nov 2026 20:27:01 +0100 Subject: [PATCH] Simplify managed resource settings subscriptions --- crates/workspace/src/workspace.rs | 41 ++++++++++++++----------------- 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs index 75ade338aea..0a0d00305ca 100644 --- a/crates/workspace/src/workspace.rs +++ b/crates/workspace/src/workspace.rs @@ -1476,7 +1476,23 @@ impl AppState { fs: Arc, cx: &mut App, ) -> Entity { - let store = cx.new(|cx| { + cx.new(|cx: &mut Context| { + cx.subscribe_self(move |_, event: &StateUpdated, cx| { + let snapshot = event.0.clone().into_content(); + cx.global::().update_settings_file( + fs.clone(), + move |settings, _| { + settings.experimental_permissions = Some(snapshot); + }, + ); + }) + .detach(); + cx.observe_global::(|store, cx| { + let snapshot = ManagedResourceSettings::get_global(cx).0.clone(); + store.replace_state(snapshot, cx); + }) + .detach(); + ManagedResourceStore::new( ManagedResourceSettings::get_global(cx).0.clone(), |request, cx| { @@ -1506,28 +1522,7 @@ impl AppState { }) }, ) - }); - let outgoing = cx.subscribe(&store, move |_, event: &StateUpdated, cx| { - let snapshot = event.0.clone().into_content(); - cx.global::() - .update_settings_file(fs.clone(), move |settings, _| { - settings.experimental_permissions = Some(snapshot); - }); - }); - let incoming = cx.observe_global::({ - let store = store.downgrade(); - move |cx| { - if let Some(store) = store.upgrade() { - let snapshot = ManagedResourceSettings::get_global(cx).0.clone(); - store.update(cx, |store, cx| store.replace_state(snapshot, cx)); - } - } - }); - store.update(cx, |_, cx| { - cx.on_release(move |_, _| drop((incoming, outgoing))) - .detach(); - }); - store + }) } #[track_caller]