foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-11-23 15:16:54 -05:00
Code Issues Packages 1 Wiki Activity

fix(lsp): don't error if completionItem/resolve request fails (#17250)

Browse source
This commit is contained in:
Bartek Iwańczuk 2023-01-03 18:13:21 +01:00
parent 7177768e49
commit a012d731ee
No known key found for this signature in database
GPG key ID: 0C6BCDDC3B3AD750
1 changed files with 23 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
cli/lsp/language_server.rs
View file

@ -1959,28 +1959,31 @@ impl Inner {
if let Some(data) = &data.tsc { if let Some(data) = &data.tsc {
let specifier = &data.specifier; let specifier = &data.specifier;
let req = tsc::RequestMethod::GetCompletionDetails(data.into()); let req = tsc::RequestMethod::GetCompletionDetails(data.into());
let maybe_completion_info: Option<tsc::CompletionEntryDetails> = let result: Result<Option<tsc::CompletionEntryDetails>, _> =
self.ts_server.request(self.snapshot(), req).await.map_err( self.ts_server.request(self.snapshot(), req).await;
|err| { match result {
error!("Unable to get completion info from TypeScript: {}", err); Ok(maybe_completion_info) => {
LspError::internal_error() if let Some(completion_info) = maybe_completion_info {
}, completion_info
)?; .as_completion_item(&params, data, specifier, self)
if let Some(completion_info) = maybe_completion_info { .map_err(|err| {
completion_info error!(
.as_completion_item(&params, data, specifier, self) "Failed to serialize virtual_text_document response: {}",
.map_err(|err| { err
);
LspError::internal_error()
})?
} else {
error!( error!(
"Failed to serialize virtual_text_document response: {}", "Received an undefined response from tsc for completion details."
err
); );
LspError::internal_error() params
})? }
} else { }
error!( Err(err) => {
"Received an undefined response from tsc for completion details." error!("Unable to get completion info from TypeScript: {}", err);
); return Ok(params);
params }
} }
} else if let Some(url) = data.documentation { } else if let Some(url) = data.documentation {
CompletionItem { CompletionItem {