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

Use originating language server to resolve additional completion edits

Browse source
This commit is contained in:
Julia 2023-08-15 16:34:15 -04:00
parent 7a67ec5743
commit 40ce099780
6 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
crates/project/src/lsp_command.rs
View file

@ -1338,7 +1338,7 @@ impl LspCommand for GetCompletions {
completions: Option<lsp::CompletionResponse>,
_: ModelHandle<Project>,
buffer: ModelHandle<Buffer>,
_: LanguageServerId,
server_id: LanguageServerId,
cx: AsyncAppContext,
) -> Result<Vec<Completion>> {
let completions = if let Some(completions) = completions {
@ -1425,6 +1425,7 @@ impl LspCommand for GetCompletions {
lsp_completion.filter_text.as_deref(),
)
}),
server_id,
lsp_completion,
}
})

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

@ -4470,7 +4470,8 @@ impl Project {
let buffer_id = buffer.remote_id();
if self.is_local() {
let lang_server = match self.primary_language_server_for_buffer(buffer, cx) {
let server_id = completion.server_id;
let lang_server = match self.language_server_for_buffer(buffer, server_id, cx) {
Some((_, server)) => server.clone(),
_ => return Task::ready(Ok(Default::default())),
};