git.iko.soy/helix
on master help sign in
lsp: refactor format so we stop cloning the language_server
184637cBlaž Hrastnik
helix-lsp/src/client.rs+9−5
compare with master
unifiedsplit
@@ -583,19 +583,19 @@ impl Client {
583
583
584 // formatting
584 // formatting
585
585
586− pub async fn text_document_formatting(
586+ pub fn text_document_formatting(
587 &self,
587 &self,
588 text_document: lsp::TextDocumentIdentifier,
588 text_document: lsp::TextDocumentIdentifier,
589 options: lsp::FormattingOptions,
589 options: lsp::FormattingOptions,
590 work_done_token: Option<lsp::ProgressToken>,
590 work_done_token: Option<lsp::ProgressToken>,
591− ) -> anyhow::Result<Vec<lsp::TextEdit>> {
591+ ) -> Option<impl Future<Output = Result<Vec<lsp::TextEdit>>>> {
592 let capabilities = self.capabilities.get().unwrap();
592 let capabilities = self.capabilities.get().unwrap();
593
593
594 // check if we're able to format
594 // check if we're able to format
595 match capabilities.document_formatting_provider {
595 match capabilities.document_formatting_provider {
596 Some(lsp::OneOf::Left(true)) | Some(lsp::OneOf::Right(_)) => (),
596 Some(lsp::OneOf::Left(true)) | Some(lsp::OneOf::Right(_)) => (),
597 // None | Some(false)
597 // None | Some(false)
598− _ => return Ok(Vec::new()),
598+ _ => return None,
599 };
599 };
600 // TODO: return err::unavailable so we can fall back to tree sitter formatting
600 // TODO: return err::unavailable so we can fall back to tree sitter formatting
601
601
@@ -605,9 +605,13 @@ impl Client {
605 work_done_progress_params: lsp::WorkDoneProgressParams { work_done_token },
605 work_done_progress_params: lsp::WorkDoneProgressParams { work_done_token },
606 };
606 };
607
607
608− let response = self.request::<lsp::request::Formatting>(params).await?;
608+ let request = self.call::<lsp::request::Formatting>(params);
609
609
610+ Some(async move {
611+ let json = request.await?;
612+ let response: Vec<lsp::TextEdit> = serde_json::from_value(json)?;
610− Ok(response.unwrap_or_default())
613+ Ok(response)
614+ })
611 }
615 }
612
616
613 pub async fn text_document_range_formatting(
617 pub async fn text_document_range_formatting(
helix-view/src/document.rs+13−10
@@ -386,21 +386,24 @@ impl Document {
386 /// If supported, returns the changes that should be applied to this document in order
386 /// If supported, returns the changes that should be applied to this document in order
387 /// to format it nicely.
387 /// to format it nicely.
388 pub fn format(&self) -> Option<impl Future<Output = LspFormatting> + 'static> {
388 pub fn format(&self) -> Option<impl Future<Output = LspFormatting> + 'static> {
389− if let Some(language_server) = self.language_server.clone() {
389+ if let Some(language_server) = self.language_server() {
390 let text = self.text.clone();
390 let text = self.text.clone();
391+ let offset_encoding = language_server.offset_encoding();
392+ let request = language_server.text_document_formatting(
391− let id = self.identifier();
393+ self.identifier(),
394+ lsp::FormattingOptions::default(),
395+ None,
396+ )?;
397+
392 let fut = async move {
398 let fut = async move {
393− let edits = language_server
394− .text_document_formatting(id, lsp::FormattingOptions::default(), None)
395− .await
396− .unwrap_or_else(|e| {
399+ let edits = request.await.unwrap_or_else(|e| {
397− log::warn!("LSP formatting failed: {}", e);
400+ log::warn!("LSP formatting failed: {}", e);
398− Default::default()
401+ Default::default()
399− });
402+ });
400 LspFormatting {
403 LspFormatting {
401 doc: text,
404 doc: text,
402 edits,
405 edits,
403− offset_encoding: language_server.offset_encoding(),
406+ offset_encoding,
404 }
407 }
405 };
408 };
406 Some(fut)
409 Some(fut)