squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Fix code completion not inserting borrow text when client supports InsertAndReplace

Browse source
This commit is contained in:
Lukas Tobias Wirth 2021-05-20 23:22:21 +02:00
parent 8bb37737c9
commit 6b0ac95df1
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -270,9 +270,12 @@ pub(crate) fn completion_item(
set_score(&mut lsp_item_with_ref, relevance);
lsp_item_with_ref.label =
format!("&{}{}", mutability.as_keyword_for_ref(), lsp_item_with_ref.label);
if let Some(lsp_types::CompletionTextEdit::Edit(it)) = &mut lsp_item_with_ref.text_edit
{
it.new_text = format!("&{}{}", mutability.as_keyword_for_ref(), it.new_text);
if let Some(it) = &mut lsp_item_with_ref.text_edit {
let new_text = match it {
lsp_types::CompletionTextEdit::Edit(it) => &mut it.new_text,
lsp_types::CompletionTextEdit::InsertAndReplace(it) => &mut it.new_text,
};
*new_text = format!("&{}{}", mutability.as_keyword_for_ref(), new_text);
}
vec![lsp_item_with_ref, lsp_item]
}