andrey/helix-mirror
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2024-11-22 01:16:18 +04:00
Code Issues Projects Releases Wiki Activity

Fix unwraps in lsp::transport

Browse Source
This commit is contained in:
wojciechkepka 2021-06-19 04:57:05 +02:00 committed by Blaž Hrastnik
parent c2aad859b1
commit dd0af78079
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
helix-lsp/src/transport.rs
View File

@ -1,4 +1,5 @@
use crate::Result;
use anyhow::Context;
use jsonrpc_core as jsonrpc;
use log::{error, info};
use serde::{Deserialize, Serialize};
@ -90,7 +91,7 @@ async fn recv_server_message(
match (parts.next(), parts.next(), parts.next()) {
(Some("Content-Length"), Some(value), None) => {
content_length = Some(value.parse().unwrap());
content_length = Some(value.parse().context("invalid content length")?);
}
(Some(_), Some(_), None) => {}
_ => {
@ -103,12 +104,12 @@ async fn recv_server_message(
}
}
let content_length = content_length.unwrap();
let content_length = content_length.context("missing content length")?;
//TODO: reuse vector
let mut content = vec![0; content_length];
reader.read_exact(&mut content).await?;
let msg = String::from_utf8(content).unwrap();
let msg = String::from_utf8(content).context("invalid utf8 from server")?;
info!("<- {}", msg);
@ -162,7 +163,9 @@ async fn process_server_message(&mut self, msg: ServerMessage) -> Result<()> {
match msg {
ServerMessage::Output(output) => self.process_request_response(output).await?,
ServerMessage::Call(call) => {
self.client_tx.send((self.id, call)).unwrap();
self.client_tx
.send((self.id, call))
.context("failed to send a message to server")?;
// let notification = Notification::parse(&method, params);
}
};