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

LSP: Fix option handling in goto definition/references commands

Browse source 
The language server may return `None` for a definition/reference
request. The parent commits introduced a regression for these commands
when a server did not provide locations. With this change a server may
respond with `null` and its locations will instead not be considered.

Fixes #12732
This commit is contained in:
Michael Davis 2025-01-30 11:54:36 -05:00
parent 1a821ac726
commit d285a8a9e5
No known key found for this signature in database
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -903,7 +903,7 @@ where
let future = request_provider(language_server, pos, doc.identifier()).unwrap(); let future = request_provider(language_server, pos, doc.identifier()).unwrap();
async move { async move {
let json = future.await?; let json = future.await?;
let response: lsp::GotoDefinitionResponse = serde_json::from_value(json)?; let response: Option<lsp::GotoDefinitionResponse> = serde_json::from_value(json)?;
anyhow::Ok((response, offset_encoding)) anyhow::Ok((response, offset_encoding))
} }
}) })
@ -913,17 +913,17 @@ where
let mut locations = Vec::new(); let mut locations = Vec::new();
while let Some((response, offset_encoding)) = futures.try_next().await? { while let Some((response, offset_encoding)) = futures.try_next().await? {
match response { match response {
lsp::GotoDefinitionResponse::Scalar(lsp_location) => { Some(lsp::GotoDefinitionResponse::Scalar(lsp_location)) => {
locations.extend(lsp_location_to_location(lsp_location, offset_encoding)); locations.extend(lsp_location_to_location(lsp_location, offset_encoding));
} }
lsp::GotoDefinitionResponse::Array(lsp_locations) => { Some(lsp::GotoDefinitionResponse::Array(lsp_locations)) => {
locations.extend( locations.extend(
lsp_locations.into_iter().flat_map(|location| { lsp_locations.into_iter().flat_map(|location| {
lsp_location_to_location(location, offset_encoding) lsp_location_to_location(location, offset_encoding)
}), }),
); );
} }
lsp::GotoDefinitionResponse::Link(lsp_locations) => { Some(lsp::GotoDefinitionResponse::Link(lsp_locations)) => {
locations.extend( locations.extend(
lsp_locations lsp_locations
.into_iter() .into_iter()
@ -938,6 +938,7 @@ where
}), }),
); );
} }
None => (),
} }
} }
let call = move |editor: &mut Editor, compositor: &mut Compositor| { let call = move |editor: &mut Editor, compositor: &mut Compositor| {
@ -1002,7 +1003,7 @@ pub fn goto_reference(cx: &mut Context) {
.unwrap(); .unwrap();
async move { async move {
let json = future.await?; let json = future.await?;
let locations: Vec<lsp::Location> = serde_json::from_value(json)?; let locations: Option<Vec<lsp::Location>> = serde_json::from_value(json)?;
anyhow::Ok((locations, offset_encoding)) anyhow::Ok((locations, offset_encoding))
} }
}) })
@ -1014,6 +1015,7 @@ pub fn goto_reference(cx: &mut Context) {
locations.extend( locations.extend(
lsp_locations lsp_locations
.into_iter() .into_iter()
.flatten()
.flat_map(|location| lsp_location_to_location(location, offset_encoding)), .flat_map(|location| lsp_location_to_location(location, offset_encoding)),
); );
} }