git.iko.soy/helix
on master help sign in
lsp: Fix compilation errors.
4240f75Blaž Hrastnik
helix-lsp/src/client.rs+13−40
compare with master
unifiedsplit
@@ -583,7 +583,12 @@ impl Client {
583 Ok(response.unwrap_or_default())
583 Ok(response.unwrap_or_default())
584 }
584 }
585
585
586− pub async fn goto_request<T: lsp::request::Request>(
586+ async fn goto_request<
587+ T: lsp::request::Request<
588+ Params = lsp::GotoDefinitionParams,
589+ Result = Option<lsp::GotoDefinitionResponse>,
590+ >,
591+ >(
587 &self,
592 &self,
588 text_document: lsp::TextDocumentIdentifier,
593 text_document: lsp::TextDocumentIdentifier,
589 position: lsp::Position,
594 position: lsp::Position,
@@ -628,7 +633,8 @@ impl Client {
628 text_document: lsp::TextDocumentIdentifier,
633 text_document: lsp::TextDocumentIdentifier,
629 position: lsp::Position,
634 position: lsp::Position,
630 ) -> anyhow::Result<Vec<lsp::Location>> {
635 ) -> anyhow::Result<Vec<lsp::Location>> {
631− self.goto_request(response).await
636+ self.goto_request::<lsp::request::GotoDefinition>(text_document, position)
637+ .await
632 }
638 }
633
639
634 pub async fn goto_type_definition(
640 pub async fn goto_type_definition(
@@ -636,24 +642,8 @@ impl Client {
636 text_document: lsp::TextDocumentIdentifier,
642 text_document: lsp::TextDocumentIdentifier,
637 position: lsp::Position,
643 position: lsp::Position,
638 ) -> anyhow::Result<Vec<lsp::Location>> {
644 ) -> anyhow::Result<Vec<lsp::Location>> {
639− let params = lsp::GotoDefinitionParams {
640− text_document_position_params: lsp::TextDocumentPositionParams {
641− text_document,
642− position,
643− },
644− work_done_progress_params: lsp::WorkDoneProgressParams {
645− work_done_token: None,
646− },
647− partial_result_params: lsp::PartialResultParams {
648− partial_result_token: None,
649− },
650− };
651−
652− let response = self
653− .request::<lsp::request::GotoTypeDefinition>(params)
645+ self.goto_request::<lsp::request::GotoTypeDefinition>(text_document, position)
654− .await?;
646+ .await
655−
656− self.goto_request(response).await
657 }
647 }
658
648
659 pub async fn goto_implementation(
649 pub async fn goto_implementation(
@@ -661,24 +651,8 @@ impl Client {
661 text_document: lsp::TextDocumentIdentifier,
651 text_document: lsp::TextDocumentIdentifier,
662 position: lsp::Position,
652 position: lsp::Position,
663 ) -> anyhow::Result<Vec<lsp::Location>> {
653 ) -> anyhow::Result<Vec<lsp::Location>> {
664− let params = lsp::GotoDefinitionParams {
665− text_document_position_params: lsp::TextDocumentPositionParams {
666− text_document,
667− position,
668− },
669− work_done_progress_params: lsp::WorkDoneProgressParams {
670− work_done_token: None,
671− },
672− partial_result_params: lsp::PartialResultParams {
673− partial_result_token: None,
674− },
675− };
676−
677− let response = self
678− .request::<lsp::request::GotoImplementation>(params)
654+ self.goto_request::<lsp::request::GotoImplementation>(text_document, position)
679− .await?;
655+ .await
680−
681− self.goto_request(response).await
682 }
656 }
683
657
684 pub async fn goto_reference(
658 pub async fn goto_reference(
@@ -704,7 +678,6 @@ impl Client {
704
678
705 let response = self.request::<lsp::request::References>(params).await?;
679 let response = self.request::<lsp::request::References>(params).await?;
706
680
707− self.goto_request(response.map(lsp::GotoDefinitionResponse::Array))
681+ Ok(response.unwrap_or_default())
708− .await
709 }
682 }
710}
683}