Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Minor fixes found during review

Browse source
This commit is contained in:
Isaac Clayton 2022-07-11 10:37:51 +02:00
parent 8931218dc6
commit 8c91c5c575
3 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
crates/project/src/project.rs
View file

@ -1722,7 +1722,7 @@ impl Project {
.await?;
this.update(&mut cx, |this, cx| {
this.assign_language_to_buffer(&buffer, cx);
this.register_buffer_with_language_server(&buffer, cx)
this.register_buffer_with_language_server(&buffer, cx);
});
Ok(())
})
@ -2120,6 +2120,14 @@ impl Project {
let adapter = adapter.clone();
move |params, mut cx| {
if let Some(this) = this.upgrade(&cx) {
// cx.spawn(|cx| {
// this.update(&mut cx, |this, cx| {
// this.on_lsp_diagnostics_published(
// server_id, params, adapter, cx,
// )
// })
// })
// .detach();
this.update(&mut cx, |this, cx| {
// TODO(isaac): remove block on
smol::block_on(this.on_lsp_diagnostics_published(
@ -3414,11 +3422,11 @@ impl Project {
}
new_symbols
});
for new_symbol in new_symbols {
if let Some(new_symbol) = new_symbol.await.ok() {
symbols.push(new_symbol);
}
}
symbols = futures::future::join_all(new_symbols.into_iter())
.await
.into_iter()
.filter_map(|symbol| symbol.ok())
.collect::<Vec<_>>();
}
Ok(symbols)
})