From 800d79b584cd09020488b8a614e5214b929d8f5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Wed, 1 Sep 2021 14:54:11 +0900
Subject: [PATCH] ls: Refactor textDocument/didSave in a similar vein

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

diff --git a/helix-lsp/src/client.rs b/helix-lsp/src/client.rs
index fdff553fe..b8fbfddb0 100644
--- a/helix-lsp/src/client.rs
+++ b/helix-lsp/src/client.rs
@@ -490,11 +490,11 @@ impl Client {
 
     // will_save / will_save_wait_until
 
-    pub async fn text_document_did_save(
+    pub fn text_document_did_save(
         &self,
         text_document: lsp::TextDocumentIdentifier,
         text: &Rope,
-    ) -> Result<()> {
+    ) -> Option<impl Future<Output = Result<()>>> {
         let capabilities = self.capabilities.get().unwrap();
 
         let include_text = match &capabilities.text_document_sync {
@@ -507,17 +507,18 @@ impl Client {
                     include_text,
                 }) => include_text.unwrap_or(false),
                 // Supported(false)
-                _ => return Ok(()),
+                _ => return None,
             },
             // unsupported
-            _ => return Ok(()),
+            _ => return None,
         };
 
-        self.notify::<lsp::notification::DidSaveTextDocument>(lsp::DidSaveTextDocumentParams {
-            text_document,
-            text: include_text.then(|| text.into()),
-        })
-        .await
+        Some(self.notify::<lsp::notification::DidSaveTextDocument>(
+            lsp::DidSaveTextDocumentParams {
+                text_document,
+                text: include_text.then(|| text.into()),
+            },
+        ))
     }
 
     pub fn completion(
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index a27be8e6d..5677eb445 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -471,10 +471,10 @@ impl Document {
             let mut file = File::create(path).await?;
             to_writer(&mut file, encoding, &text).await?;
 
-            if let Some(language_server) = language_server {
-                language_server
-                    .text_document_did_save(identifier, &text)
-                    .await?;
+            if let Some(notification) = language_server.and_then(|language_server| {
+                language_server.text_document_did_save(identifier, &text)
+            }) {
+                notification.await?;
             }
 
             Ok(())