From 37606bad47fe0e197cb34fc7d52856597c32ce33 Mon Sep 17 00:00:00 2001
From: Blaž Hrastnik
Date: Thu, 2 Sep 2021 13:55:55 +0900
Subject: lsp: doc.language_server() is None until initialize completes

---
 helix-lsp/src/client.rs    |  4 ++++
 helix-view/src/document.rs | 13 +++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/helix-lsp/src/client.rs b/helix-lsp/src/client.rs
index 27e4697c..f2bb0059 100644
--- a/helix-lsp/src/client.rs
+++ b/helix-lsp/src/client.rs
@@ -93,6 +93,10 @@ impl Client {
         }
     }
 
+    pub fn is_initialized(&self) -> bool {
+        self.capabilities.get().is_some()
+    }
+
     pub fn capabilities(&self) -> &lsp::ServerCapabilities {
         self.capabilities
             .get()
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index 71f6680c..362a433e 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -798,9 +798,18 @@ impl Document {
         self.version
     }
 
-    #[inline]
     pub fn language_server(&self) -> Option<&helix_lsp::Client> {
-        self.language_server.as_deref()
+        let server = self.language_server.as_deref();
+        let initialized = server
+            .map(|server| server.is_initialized())
+            .unwrap_or(false);
+
+        // only resolve language_server if it's initialized
+        if initialized {
+            server
+        } else {
+            None
+        }
     }
 
     #[inline]
-- 
cgit v1.2.3-70-g09d2