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

Avoid error during deserialization if the result field isn't there

Browse Source
This commit is contained in:
Antonio Scandurra 2021-11-02 14:58:00 +01:00
parent f5aa07aac9
commit 882c8ce696
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
crates/lsp/src/lib.rs
View File

@ -61,7 +61,7 @@ struct AnyResponse<'a> {
#[serde(default)]
error: Option<Error>,
#[serde(borrow)]
result: &'a RawValue,
result: Option<&'a RawValue>,
}
#[derive(Serialize, Deserialize)]
@ -157,8 +157,10 @@ impl LanguageServer {
if let Some(handler) = response_handlers.lock().remove(&id) {
if let Some(error) = error {
handler(Err(error));
} else {
} else if let Some(result) = result {
handler(Ok(result.get()));
} else {
handler(Ok("null"));
}
}
} else {
@ -459,7 +461,7 @@ impl FakeLanguageServer {
let message = serde_json::to_vec(&AnyResponse {
id: request_id.id,
error: None,
result: &RawValue::from_string(result).unwrap(),
result: Some(&RawValue::from_string(result).unwrap()),
})
.unwrap();
self.send(message).await;