Pass http client to dap store

RemcoSmitsDev · Sep 24, 2024 · 4010095 · 4010095
1 parent 3b3ac85
commit 4010095
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/crates/project/src/dap_store.rs b/crates/project/src/dap_store.rs
@@ -18,6 +18,7 @@ use dap::{
     VariablesArguments,
 };
 use gpui::{EventEmitter, ModelContext, Task};
+use http_client::HttpClient;
 use language::{Buffer, BufferSnapshot};
 use serde_json::Value;
 use settings::WorktreeId;
@@ -54,19 +55,21 @@ pub struct DapStore {
     clients: HashMap<DebugAdapterClientId, DebugAdapterClientState>,
     breakpoints: BTreeMap<ProjectPath, HashSet<Breakpoint>>,
     capabilities: HashMap<DebugAdapterClientId, Capabilities>,
+    _http_client: Option<Arc<dyn HttpClient>>,
 }
 
 impl EventEmitter<DapStoreEvent> for DapStore {}
 
 impl DapStore {
-    pub fn new(cx: &mut ModelContext<Self>) -> Self {
+    pub fn new(http_client: Option<Arc<dyn HttpClient>>, cx: &mut ModelContext<Self>) -> Self {
         cx.on_app_quit(Self::shutdown_clients).detach();
 
         Self {
             clients: Default::default(),
             capabilities: HashMap::default(),
             breakpoints: Default::default(),
             next_client_id: Default::default(),
+            _http_client: http_client,
         }
     }
 

diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
@@ -653,7 +653,7 @@ impl Project {
             cx.subscribe(&worktree_store, Self::on_worktree_store_event)
                 .detach();
 
-            let dap_store = cx.new_model(DapStore::new);
+            let dap_store = cx.new_model(|cx| DapStore::new(Some(client.http_client()), cx));
 
             let buffer_store = cx.new_model(|cx| {
                 BufferStore::new(worktree_store.clone(), None, dap_store.clone(), cx)
@@ -757,7 +757,7 @@ impl Project {
             cx.subscribe(&worktree_store, Self::on_worktree_store_event)
                 .detach();
 
-            let dap_store = cx.new_model(DapStore::new);
+            let dap_store = cx.new_model(|cx| DapStore::new(Some(client.http_client()), cx));
 
             let buffer_store = cx.new_model(|cx| {
                 BufferStore::new(worktree_store.clone(), None, dap_store.clone(), cx)
@@ -916,7 +916,7 @@ impl Project {
             store
         })?;
 
-        let dap_store = cx.new_model(DapStore::new)?;
+        let dap_store = cx.new_model(|cx| DapStore::new(Some(client.http_client()), cx))?;
 
         let buffer_store = cx.new_model(|cx| {
             BufferStore::new(

diff --git a/crates/remote_server/src/headless_project.rs b/crates/remote_server/src/headless_project.rs
@@ -51,7 +51,7 @@ impl HeadlessProject {
             store
         });
 
-        let dap_store = cx.new_model(DapStore::new);
+        let dap_store = cx.new_model(|cx| DapStore::new(None, cx));
         let buffer_store = cx.new_model(|cx| {
             let mut buffer_store = BufferStore::new(
                 worktree_store.clone(),