From 847d1fa496f157c1a9640c5cedd92d6593e33b08 Mon Sep 17 00:00:00 2001
From: Blaž Hrastnik
Date: Sun, 29 Aug 2021 18:38:28 +0900
Subject: fix: Work around crashes on LSPs that don't just emit JSON-RPC

---
 helix-lsp/src/transport.rs | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'helix-lsp/src')

diff --git a/helix-lsp/src/transport.rs b/helix-lsp/src/transport.rs
index 068ea230..67b7b48f 100644
--- a/helix-lsp/src/transport.rs
+++ b/helix-lsp/src/transport.rs
@@ -1,7 +1,7 @@
 use crate::Result;
-use anyhow::{anyhow, Context};
+use anyhow::Context;
 use jsonrpc_core as jsonrpc;
-use log::{debug, error, info};
+use log::{debug, error, info, warn};
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 use std::collections::HashMap;
@@ -92,7 +92,12 @@ impl Transport {
                     content_length = Some(value.parse().context("invalid content length")?);
                 }
                 Some((_, _)) => {}
-                None => return Err(anyhow!("Failed to parse header: {:?}", header).into()),
+                None => {
+                    // Workaround: Some non-conformant language servers will output logging and other garbage
+                    // into the same stream as JSON-RPC messages. This can also happen from shell scripts that spawn
+                    // the server. Skip such lines and log a warning.
+                    warn!("Failed to parse header: {:?}", header);
+                }
             }
         }
 
-- 
cgit v1.2.3-70-g09d2