zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-09-16 00:47:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix bad global

Browse Source
This commit is contained in:
Mikayla Maki 2023-03-22 22:11:31 -07:00
parent 455cdc8b37
commit 9a99eaee96
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
crates/copilot/src/copilot.rs
View File

@ -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();

1
crates/util/src/github.rs
View File

@ -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)