From 184637c55acca49380372ca118f13b3390bcb003 Mon Sep 17 00:00:00 2001
From: Blaž Hrastnik
Date: Wed, 1 Sep 2021 14:49:48 +0900
Subject: lsp: refactor format so we stop cloning the language_server

---
 helix-lsp/src/client.rs | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'helix-lsp/src')

diff --git a/helix-lsp/src/client.rs b/helix-lsp/src/client.rs
index ac6ae70a..fdff553f 100644
--- a/helix-lsp/src/client.rs
+++ b/helix-lsp/src/client.rs
@@ -583,19 +583,19 @@ impl Client {
 
     // formatting
 
-    pub async fn text_document_formatting(
+    pub fn text_document_formatting(
         &self,
         text_document: lsp::TextDocumentIdentifier,
         options: lsp::FormattingOptions,
         work_done_token: Option<lsp::ProgressToken>,
-    ) -> anyhow::Result<Vec<lsp::TextEdit>> {
+    ) -> Option<impl Future<Output = Result<Vec<lsp::TextEdit>>>> {
         let capabilities = self.capabilities.get().unwrap();
 
         // check if we're able to format
         match capabilities.document_formatting_provider {
             Some(lsp::OneOf::Left(true)) | Some(lsp::OneOf::Right(_)) => (),
             // None | Some(false)
-            _ => return Ok(Vec::new()),
+            _ => return None,
         };
         // TODO: return err::unavailable so we can fall back to tree sitter formatting
 
@@ -605,9 +605,13 @@ impl Client {
             work_done_progress_params: lsp::WorkDoneProgressParams { work_done_token },
         };
 
-        let response = self.request::<lsp::request::Formatting>(params).await?;
+        let request = self.call::<lsp::request::Formatting>(params);
 
-        Ok(response.unwrap_or_default())
+        Some(async move {
+            let json = request.await?;
+            let response: Vec<lsp::TextEdit> = serde_json::from_value(json)?;
+            Ok(response)
+        })
     }
 
     pub async fn text_document_range_formatting(
-- 
cgit v1.2.3-70-g09d2