From 7eff9056802d3d4f67fbaef7ba7dc03e874564c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Sun, 29 Aug 2021 12:40:21 +0900
Subject: [PATCH] lsp: slightly refactor header parsing, add more logging

---
 helix-lsp/src/transport.rs | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/helix-lsp/src/transport.rs b/helix-lsp/src/transport.rs
index 5be694c82..068ea2300 100644
--- a/helix-lsp/src/transport.rs
+++ b/helix-lsp/src/transport.rs
@@ -1,7 +1,7 @@
 use crate::Result;
-use anyhow::Context;
+use anyhow::{anyhow, Context};
 use jsonrpc_core as jsonrpc;
-use log::{error, info};
+use log::{debug, error, info};
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 use std::collections::HashMap;
@@ -83,20 +83,16 @@ impl Transport {
                 break;
             }
 
-            let mut parts = header.split(": ");
+            debug!("<- header {}", header);
 
-            match (parts.next(), parts.next(), parts.next()) {
-                (Some("Content-Length"), Some(value), None) => {
+            let parts = header.split_once(": ");
+
+            match parts {
+                Some(("Content-Length", value)) => {
                     content_length = Some(value.parse().context("invalid content length")?);
                 }
-                (Some(_), Some(_), None) => {}
-                _ => {
-                    return Err(std::io::Error::new(
-                        std::io::ErrorKind::Other,
-                        "Failed to parse header",
-                    )
-                    .into());
-                }
+                Some((_, _)) => {}
+                None => return Err(anyhow!("Failed to parse header: {:?}", header).into()),
             }
         }