ilyakooo0/helix
1
0
Fork 0
mirror of https://github.com/ilyakooo0/helix.git synced 2024-12-01 11:23:10 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: lsp: Terminate transport on EOF

Browse Source 
If stdout/stderr is closed, read_line will return 0 indicating EOF.
This commit is contained in:
Blaž Hrastnik 2021-08-31 14:27:55 +09:00
parent fe17b99ab3
commit 41f1e8e4fb
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
use crate::Result; use crate::{Error, Result};
use anyhow::Context; use anyhow::Context;
use jsonrpc_core as jsonrpc; use jsonrpc_core as jsonrpc;
use log::{debug, error, info, warn}; use log::{debug, error, info, warn};
@ -76,14 +76,17 @@ impl Transport {
let mut content_length = None; let mut content_length = None;
loop { loop {
buffer.truncate(0); buffer.truncate(0);
reader.read_line(buffer).await?; if reader.read_line(buffer).await? == 0 {
let header = buffer.trim(); return Err(Error::StreamClosed);
};
// debug!("<- header {:?}", buffer);
if header.is_empty() { if header.is_empty() {
break; break;
} }
debug!("<- header {}", header); let header = buffer.trim();
let parts = header.split_once(": "); let parts = header.split_once(": ");
@ -121,8 +124,10 @@ impl Transport {
buffer: &mut String, buffer: &mut String,
) -> Result<()> { ) -> Result<()> {
buffer.truncate(0); buffer.truncate(0);
err.read_line(buffer).await?; if err.read_line(buffer).await? == 0 {
error!("err <- {}", buffer); return Err(Error::StreamClosed);
};
error!("err <- {:?}", buffer);
Ok(()) Ok(())
} }