Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-29 06:23:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix signature help LSP offset conversion

Browse source
This commit is contained in:
Jonas Schievink 2022-05-16 15:48:38 +02:00
parent ee2cbe0ae8
commit 5ee028bbb8
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
crates/rust-analyzer/src/to_proto.rs
View file

@ -358,7 +358,11 @@ pub(crate) fn signature_help(
let params = call_info let params = call_info
.parameter_ranges() .parameter_ranges()
.iter() .iter()
.map(|it| [u32::from(it.start()), u32::from(it.end())]) .map(|it| {
let start = call_info.signature[..it.start().into()].chars().count() as u32;
let end = call_info.signature[..it.end().into()].chars().count() as u32;
[start, end]
})
.map(|label_offsets| lsp_types::ParameterInformation { .map(|label_offsets| lsp_types::ParameterInformation {
label: lsp_types::ParameterLabel::LabelOffsets(label_offsets), label: lsp_types::ParameterLabel::LabelOffsets(label_offsets),
documentation: None, documentation: None,
@ -375,9 +379,9 @@ pub(crate) fn signature_help(
label.push_str(", "); label.push_str(", ");
} }
first = false; first = false;
let start = label.len() as u32; let start = label.chars().count() as u32;
label.push_str(param); label.push_str(param);
let end = label.len() as u32; let end = label.chars().count() as u32;
params.push(lsp_types::ParameterInformation { params.push(lsp_types::ParameterInformation {
label: lsp_types::ParameterLabel::LabelOffsets([start, end]), label: lsp_types::ParameterLabel::LabelOffsets([start, end]),
documentation: None, documentation: None,