andrey/helix-mirror
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2025-01-19 21:47:07 +04:00
Code Issues Projects Releases Wiki Activity

goto_request wip

Browse Source
This commit is contained in:
Jan Hrastnik 2021-03-10 23:35:12 +01:00 committed by Blaž Hrastnik
parent 3869d7713e
commit a5f9080a9c
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.lock generated
View File

@ -550,7 +550,6 @@ dependencies = [
"helix-view", "helix-view",
"ignore", "ignore",
"log", "log",
"lsp-types",
"num_cpus", "num_cpus",
"once_cell", "once_cell",
"pulldown-cmark", "pulldown-cmark",

43
helix-lsp/src/client.rs
View File

@ -583,10 +583,26 @@ pub async fn text_document_range_formatting(
Ok(response.unwrap_or_default()) Ok(response.unwrap_or_default())
} }
pub async fn goto_generic( pub async fn goto_request<T: lsp::request::Request>(
&self, &self,
response: Option<lsp::GotoDefinitionResponse>, text_document: lsp::TextDocumentIdentifier,
position: lsp::Position,
) -> anyhow::Result<Vec<lsp::Location>> { ) -> anyhow::Result<Vec<lsp::Location>> {
let params = lsp::GotoDefinitionParams {
text_document_position_params: lsp::TextDocumentPositionParams {
text_document,
position,
},
work_done_progress_params: lsp::WorkDoneProgressParams {
work_done_token: None,
},
partial_result_params: lsp::PartialResultParams {
partial_result_token: None,
},
};
let response = self.request::<T>(params).await?;
let items = match response { let items = match response {
Some(lsp::GotoDefinitionResponse::Scalar(location)) => vec![location], Some(lsp::GotoDefinitionResponse::Scalar(location)) => vec![location],
Some(lsp::GotoDefinitionResponse::Array(location_vec)) => location_vec, Some(lsp::GotoDefinitionResponse::Array(location_vec)) => location_vec,
@ -612,22 +628,7 @@ pub async fn goto_definition(
text_document: lsp::TextDocumentIdentifier, text_document: lsp::TextDocumentIdentifier,
position: lsp::Position, position: lsp::Position,
) -> anyhow::Result<Vec<lsp::Location>> { ) -> anyhow::Result<Vec<lsp::Location>> {
let params = lsp::GotoDefinitionParams { self.goto_request(response).await
text_document_position_params: lsp::TextDocumentPositionParams {
text_document,
position,
},
work_done_progress_params: lsp::WorkDoneProgressParams {
work_done_token: None,
},
partial_result_params: lsp::PartialResultParams {
partial_result_token: None,
},
};
let response = self.request::<lsp::request::GotoDefinition>(params).await?;
self.goto_generic(response).await
} }
pub async fn goto_type_definition( pub async fn goto_type_definition(
@ -652,7 +653,7 @@ pub async fn goto_type_definition(
.request::<lsp::request::GotoTypeDefinition>(params) .request::<lsp::request::GotoTypeDefinition>(params)
.await?; .await?;
self.goto_generic(response).await self.goto_request(response).await
} }
pub async fn goto_implementation( pub async fn goto_implementation(
@ -677,7 +678,7 @@ pub async fn goto_implementation(
.request::<lsp::request::GotoImplementation>(params) .request::<lsp::request::GotoImplementation>(params)
.await?; .await?;
self.goto_generic(response).await self.goto_request(response).await
} }
pub async fn goto_reference( pub async fn goto_reference(
@ -703,7 +704,7 @@ pub async fn goto_reference(
let response = self.request::<lsp::request::References>(params).await?; let response = self.request::<lsp::request::References>(params).await?;
self.goto_generic(response.map(lsp::GotoDefinitionResponse::Array)) self.goto_request(response.map(lsp::GotoDefinitionResponse::Array))
.await .await
} }
} }