From 941c34a7fc86e613b41887174c699be52ab202a8 Mon Sep 17 00:00:00 2001
From: Blaž Hrastnik
Date: Wed, 6 Jan 2021 17:48:14 +0900
Subject: lsp: Move timeouts into client.request

---
 helix-lsp/src/client.rs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'helix-lsp/src')

diff --git a/helix-lsp/src/client.rs b/helix-lsp/src/client.rs
index 207e2970..e3f72a56 100644
--- a/helix-lsp/src/client.rs
+++ b/helix-lsp/src/client.rs
@@ -114,7 +114,14 @@ impl Client {
             .await
             .map_err(|e| Error::Other(e.into()))?;
 
-        let response = rx.recv().await.map_err(|e| Error::Other(e.into()))??;
+        use smol_timeout::TimeoutExt;
+        use std::time::Duration;
+
+        let response = match rx.recv().timeout(Duration::from_secs(2)).await {
+            Some(response) => response,
+            None => return Err(Error::Timeout),
+        }
+        .map_err(|e| Error::Other(e.into()))??;
 
         let response = serde_json::from_value(response)?;
 
-- 
cgit v1.2.3-70-g09d2