Skip to content

Commit

Permalink
Fix unwraps in lsp::transport
Browse files Browse the repository at this point in the history
  • Loading branch information
vv9k committed Jun 19, 2021
1 parent 31e953f commit d59507f
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions helix-lsp/src/transport.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use crate::Result;
use anyhow::Context;
use jsonrpc_core as jsonrpc;
use log::{error, info};
use serde::{Deserialize, Serialize};
Expand Down Expand Up @@ -90,7 +91,7 @@ impl Transport {

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) => {}
_ => {
Expand All @@ -103,12 +104,12 @@ impl Transport {
}
}

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);

Expand Down Expand Up @@ -162,7 +163,9 @@ impl Transport {
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);
}
};
Expand Down

0 comments on commit d59507f

Please sign in to comment.