diff options
Diffstat (limited to 'support/texlab/crates/texlab/src/features/definition.rs')
-rw-r--r-- | support/texlab/crates/texlab/src/features/definition.rs | 53 |
1 files changed, 10 insertions, 43 deletions
diff --git a/support/texlab/crates/texlab/src/features/definition.rs b/support/texlab/crates/texlab/src/features/definition.rs index ec7f08c296..098505079c 100644 --- a/support/texlab/crates/texlab/src/features/definition.rs +++ b/support/texlab/crates/texlab/src/features/definition.rs @@ -1,49 +1,16 @@ -use base_db::{FeatureParams, Workspace}; -use definition::DefinitionParams; -use lsp_types::{GotoDefinitionResponse, LocationLink, Position, Url}; +use base_db::Workspace; -use crate::util::line_index_ext::LineIndexExt; +use crate::util::{from_proto, to_proto}; pub fn goto_definition( workspace: &Workspace, - uri: &Url, - position: Position, -) -> Option<GotoDefinitionResponse> { - let document = workspace.lookup(uri)?; - let offset = document.line_index.offset_lsp(position)?; - let feature = FeatureParams::new(workspace, document); - let params = DefinitionParams { feature, offset }; + params: lsp_types::GotoDefinitionParams, +) -> Option<lsp_types::GotoDefinitionResponse> { + let params = from_proto::definition_params(workspace, params)?; + let links = definition::goto_definition(¶ms) + .into_iter() + .filter_map(|result| to_proto::location_link(result, ¶ms.feature.document.line_index)) + .collect(); - let mut links = Vec::new(); - for result in definition::goto_definition(params) { - if let Some(link) = convert_link(document, result) { - links.push(link); - } - } - - Some(GotoDefinitionResponse::Link(links)) -} - -fn convert_link( - document: &base_db::Document, - result: definition::DefinitionResult<'_>, -) -> Option<LocationLink> { - let origin_selection_range = Some( - document - .line_index - .line_col_lsp_range(result.origin_selection_range)?, - ); - - let target_line_index = &result.target.line_index; - let target_uri = result.target.uri.clone(); - let target_range = target_line_index.line_col_lsp_range(result.target_range)?; - let target_selection_range = - target_line_index.line_col_lsp_range(result.target_selection_range)?; - let value = LocationLink { - origin_selection_range, - target_uri, - target_range, - target_selection_range, - }; - Some(value) + Some(lsp_types::GotoDefinitionResponse::Link(links)) } |