Check if adapter is already installed before installing one

RemcoSmitsDev · Oct 23, 2024 · 62fd388 · 62fd388
1 parent fb3375c
commit 62fd388
Showing 1 changed file with 16 additions and 11 deletions.
diff --git a/crates/project/src/dap_store.rs b/crates/project/src/dap_store.rs
@@ -250,17 +250,22 @@ impl DapStore {
                     .context("Creating debug adapter")
                     .log_err()?,
             );
-            let _ = adapter
-                .install_binary(&adapter_delegate)
-                .await
-                .context("Failed to install debug adapter binary")
-                .log_err()?;
 
-            let binary = adapter
-                .fetch_binary(&adapter_delegate, &config)
-                .await
-                .context("Failed to get debug adapter binary")
-                .log_err()?;
+            let mut binary = adapter.fetch_binary(&adapter_delegate, &config).await.ok();
+
+            if binary.is_none() {
+                let _ = adapter
+                    .install_binary(&adapter_delegate)
+                    .await
+                    .context("Failed to install debug adapter binary")
+                    .log_err()?;
+
+                binary = adapter
+                    .fetch_binary(&adapter_delegate, &config)
+                    .await
+                    .context("Failed to get debug adapter binary")
+                    .log_err();
+            }
 
             let mut request_args = json!({});
             if let Some(config_args) = config.initialize_args.clone() {
@@ -277,7 +282,7 @@ impl DapStore {
 
             client
                 .start(
-                    &binary,
+                    &binary?,
                     move |message, cx| {
                         dap_store
                             .update(cx, |_, cx| {