mirrors/helix
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2025-04-05 11:57:43 +03:00
Code Issues Projects Releases Packages Wiki Activity

LSP: Support multiple language servers for goto definition

Browse source 
This covers all goto-definition-like commands: declaration, definition,
type definition and implementation.

Closes #11689

Co-authored-by: j <junglerobba@jngl.one>
This commit is contained in:
Michael Davis 2025-01-30 09:54:25 -05:00
parent ba116b47a0
commit f7394d53fd
No known key found for this signature in database
1 changed files with 51 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

90
helix-term/src/commands/lsp.rs
View file

@ -889,54 +889,66 @@ fn goto_impl(editor: &mut Editor, compositor: &mut Compositor, locations: Vec<Lo
} }
} }
fn to_locations(
definitions: Option<lsp::GotoDefinitionResponse>,
offset_encoding: OffsetEncoding,
) -> Vec<Location> {
match definitions {
Some(lsp::GotoDefinitionResponse::Scalar(location)) => {
lsp_location_to_location(location, offset_encoding)
.into_iter()
.collect()
}
Some(lsp::GotoDefinitionResponse::Array(locations)) => locations
.into_iter()
.flat_map(|location| lsp_location_to_location(location, offset_encoding))
.collect(),
Some(lsp::GotoDefinitionResponse::Link(locations)) => locations
.into_iter()
.map(|location_link| {
lsp::Location::new(location_link.target_uri, location_link.target_range)
})
.flat_map(|location| lsp_location_to_location(location, offset_encoding))
.collect(),
None => Vec::new(),
}
}
fn goto_single_impl<P, F>(cx: &mut Context, feature: LanguageServerFeature, request_provider: P) fn goto_single_impl<P, F>(cx: &mut Context, feature: LanguageServerFeature, request_provider: P)
where where
P: Fn(&Client, lsp::Position, lsp::TextDocumentIdentifier) -> Option<F>, P: Fn(&Client, lsp::Position, lsp::TextDocumentIdentifier) -> Option<F>,
F: Future<Output = helix_lsp::Result<serde_json::Value>> + 'static + Send, F: Future<Output = helix_lsp::Result<serde_json::Value>> + 'static + Send,
{ {
let (view, doc) = current!(cx.editor); let (view, doc) = current_ref!(cx.editor);
let mut futures: FuturesOrdered<_> = doc
.language_servers_with_feature(feature)
.map(|language_server| {
let offset_encoding = language_server.offset_encoding();
let pos = doc.position(view.id, offset_encoding);
let future = request_provider(language_server, pos, doc.identifier()).unwrap();
async move {
let json = future.await?;
let response: lsp::GotoDefinitionResponse = serde_json::from_value(json)?;
anyhow::Ok((response, offset_encoding))
}
})
.collect();
let language_server = language_server_with_feature!(cx.editor, doc, feature); cx.jobs.callback(async move {
let offset_encoding = language_server.offset_encoding(); let mut locations = Vec::new();
let pos = doc.position(view.id, offset_encoding); while let Some((response, offset_encoding)) = futures.try_next().await? {
let future = request_provider(language_server, pos, doc.identifier()).unwrap(); match response {
lsp::GotoDefinitionResponse::Scalar(lsp_location) => {
cx.callback( locations.extend(lsp_location_to_location(lsp_location, offset_encoding));
future, }
move |editor, compositor, response: Option<lsp::GotoDefinitionResponse>| { lsp::GotoDefinitionResponse::Array(lsp_locations) => {
let items = to_locations(response, offset_encoding); locations.extend(
if items.is_empty() { lsp_locations.into_iter().flat_map(|location| {
lsp_location_to_location(location, offset_encoding)
}),
);
}
lsp::GotoDefinitionResponse::Link(lsp_locations) => {
locations.extend(
lsp_locations
.into_iter()
.map(|location_link| {
lsp::Location::new(
location_link.target_uri,
location_link.target_range,
)
})
.flat_map(|location| {
lsp_location_to_location(location, offset_encoding)
}),
);
}
}
}
let call = move |editor: &mut Editor, compositor: &mut Compositor| {
if locations.is_empty() {
editor.set_error("No definition found."); editor.set_error("No definition found.");
} else { } else {
goto_impl(editor, compositor, items); goto_impl(editor, compositor, locations);
} }
}, };
); Ok(Callback::EditorCompositor(Box::new(call)))
});
} }
pub fn goto_declaration(cx: &mut Context) { pub fn goto_declaration(cx: &mut Context) {