ls: Refactor textDocument/didSave in a similar vein

pull/724/head
Blaž Hrastnik 3 years ago
parent 184637c55a
commit 800d79b584

@ -490,11 +490,11 @@ impl Client {
// will_save / will_save_wait_until // will_save / will_save_wait_until
pub async fn text_document_did_save( pub fn text_document_did_save(
&self, &self,
text_document: lsp::TextDocumentIdentifier, text_document: lsp::TextDocumentIdentifier,
text: &Rope, text: &Rope,
) -> Result<()> { ) -> Option<impl Future<Output = Result<()>>> {
let capabilities = self.capabilities.get().unwrap(); let capabilities = self.capabilities.get().unwrap();
let include_text = match &capabilities.text_document_sync { let include_text = match &capabilities.text_document_sync {
@ -507,17 +507,18 @@ impl Client {
include_text, include_text,
}) => include_text.unwrap_or(false), }) => include_text.unwrap_or(false),
// Supported(false) // Supported(false)
_ => return Ok(()), _ => return None,
}, },
// unsupported // unsupported
_ => return Ok(()), _ => return None,
}; };
self.notify::<lsp::notification::DidSaveTextDocument>(lsp::DidSaveTextDocumentParams { Some(self.notify::<lsp::notification::DidSaveTextDocument>(
text_document, lsp::DidSaveTextDocumentParams {
text: include_text.then(|| text.into()), text_document,
}) text: include_text.then(|| text.into()),
.await },
))
} }
pub fn completion( pub fn completion(

@ -471,10 +471,10 @@ impl Document {
let mut file = File::create(path).await?; let mut file = File::create(path).await?;
to_writer(&mut file, encoding, &text).await?; to_writer(&mut file, encoding, &text).await?;
if let Some(language_server) = language_server { if let Some(notification) = language_server.and_then(|language_server| {
language_server language_server.text_document_did_save(identifier, &text)
.text_document_did_save(identifier, &text) }) {
.await?; notification.await?;
} }
Ok(()) Ok(())

Loading…
Cancel
Save