Handle multiple headers

zed-industries · Feb 2, 2024 · b8a1416 · b8a1416
1 parent a7462f6
commit b8a1416
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/crates/lsp/src/lsp.rs b/crates/lsp/src/lsp.rs
@@ -320,21 +320,26 @@ impl LanguageServer {
             }
         });
         let mut buffer = Vec::new();
-        loop {
+        'outer: loop {
             buffer.clear();
 
-            if stdout.read_until(b'\n', &mut buffer).await? == 0 {
-                break;
-            };
-
-            if stdout.read_until(b'\n', &mut buffer).await? == 0 {
-                break;
-            };
+            while let Ok(bytes_read) = stdout.read_until(b'\n', &mut buffer).await {
+                if bytes_read == 0 {
+                    break 'outer;
+                }
+                if buffer.ends_with(b"\r\n\r\n") {
+                    break;
+                }
+            }
 
             let header = std::str::from_utf8(&buffer)?;
             let message_len: usize = header
                 .strip_prefix(CONTENT_LEN_HEADER)
                 .ok_or_else(|| anyhow!("invalid LSP message header {header:?}"))?
+                .split_whitespace()
+                .collect::<Vec<&str>>()
+                .get_mut(0)
+                .ok_or_else(|| anyhow!("invalid LSP message header {header:?}"))?
                 .trim_end()
                 .parse()?;