Fix bad global

Mikayla Maki created 2 years ago

Change summary

crates/copilot/src/copilot.rs | 7 +++++--
crates/util/src/github.rs     | 1 +
2 files changed, 6 insertions(+), 2 deletions(-)

Detailed changes

crates/copilot/src/copilot.rs

@@ -16,17 +16,18 @@ pub fn init(client: Arc<Client>, cx: &mut MutableAppContext) {
     });
 }
 
+#[derive(Debug)]
 struct Copilot {
     copilot_server: PathBuf,
 }
 
 impl Copilot {
     fn sign_in(http: Arc<dyn HttpClient>, cx: &mut MutableAppContext) {
-        let copilot = cx.global::<Option<Arc<Copilot>>>().clone();
+        let maybe_copilot = cx.default_global::<Option<Arc<Copilot>>>().clone();
 
         cx.spawn(|mut cx| async move {
             // Lazily download / initialize copilot LSP
-            let copilot = if let Some(copilot) = copilot {
+            let copilot = if let Some(copilot) = maybe_copilot {
                 copilot
             } else {
                 let copilot_server = get_lsp_binary(http).await?; // TODO: Make this error user visible
@@ -38,6 +39,8 @@ impl Copilot {
                 new_copilot
             };
 
+            dbg!(copilot);
+
             Ok(())
         })
         .detach();

crates/util/src/github.rs

@@ -34,6 +34,7 @@ pub async fn latest_github_release(
         .read_to_end(&mut body)
         .await
         .context("error reading latest release")?;
+
     let release: GithubRelease =
         serde_json::from_slice(body.as_slice()).context("error deserializing latest release")?;
     Ok(release)