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

Regenerate completion labels on resolve (#21521)

Browse source 
Closes https://github.com/zed-industries/zed/issues/21516

Technically, this is an LSP violation from `vtsls`, but seems that it's
not going to be fixed adequately on that side, see
https://github.com/yioneko/vtsls/issues/213 for more context.
So, we have to accommodate at least for now.

Release Notes:

- Fixed completion item labels not being updated after the resolve for
non-LSP compliant servers
This commit is contained in:
Kirill Bulatov 2024-12-04 23:37:24 +02:00 • committed by GitHub
parent 8d18dfa4c1
commit 55ecb3c51b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 124 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

35
crates/project/src/lsp_store.rs
View file

@ -2241,17 +2241,23 @@ impl LspStore {
(server_id, completion)
};
let server = this
.read_with(&cx, |this, _| this.language_server_for_id(server_id))
let server_and_adapter = this
.read_with(&cx, |lsp_store, _| {
let server = lsp_store.language_server_for_id(server_id)?;
let adapter =
lsp_store.language_server_adapter_for_id(server.server_id())?;
Some((server, adapter))
})
.ok()
.flatten();
let Some(server) = server else {
let Some((server, adapter)) = server_and_adapter else {
continue;
};
did_resolve = true;
Self::resolve_completion_local(
server,
adapter,
&buffer_snapshot,
completions.clone(),
completion_index,
@ -2268,6 +2274,7 @@ impl LspStore {
async fn resolve_completion_local(
server: Arc<lsp::LanguageServer>,
adapter: Arc<CachedLspAdapter>,
snapshot: &BufferSnapshot,
completions: Arc<RwLock<Box<[Completion]>>>,
completion_index: usize,
@ -2293,7 +2300,7 @@ impl LspStore {
let documentation = language::prepare_completion_documentation(
lsp_documentation,
&language_registry,
None, // TODO: Try to reasonably work out which language the completion is for
snapshot.language().cloned(),
)
.await;
@ -2332,9 +2339,29 @@ impl LspStore {
}
}
// NB: Zed does not have `details` inside the completion resolve capabilities, but certain language servers violate the spec and do not return `details` immediately, e.g. https://github.com/yioneko/vtsls/issues/213
// So we have to update the label here anyway...
let new_label = match snapshot.language() {
Some(language) => adapter
.labels_for_completions(&[completion_item.clone()], language)
.await
.log_err()
.unwrap_or_default(),
None => Vec::new(),
}
.pop()
.flatten()
.unwrap_or_else(|| {
CodeLabel::plain(
completion_item.label.clone(),
completion_item.filter_text.as_deref(),
)
});
let mut completions = completions.write();
let completion = &mut completions[completion_index];
completion.lsp_completion = completion_item;
completion.label = new_label;
}
#[allow(clippy::too_many_arguments)]