mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bad names

Browse Source 
`res` should only be used for the result variable
This commit is contained in:
Aleksey Kladov 2021-03-09 17:39:22 +03:00
parent 21913d0fdb
commit 2cc278c6ff
1 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
crates/rust-analyzer/src/to_proto.rs
View File

@ -173,20 +173,20 @@ pub(crate) fn snippet_text_edit_vec(
pub(crate) fn completion_item( pub(crate) fn completion_item(
line_index: &LineIndex, line_index: &LineIndex,
completion_item: CompletionItem, item: CompletionItem,
) -> Vec<lsp_types::CompletionItem> { ) -> Vec<lsp_types::CompletionItem> {
fn set_score(res: &mut lsp_types::CompletionItem, label: &str) { fn set_score(lsp_item: &mut lsp_types::CompletionItem, label: &str) {
res.preselect = Some(true); lsp_item.preselect = Some(true);
// HACK: sort preselect items first // HACK: sort preselect items first
res.sort_text = Some(format!(" {}", label)); lsp_item.sort_text = Some(format!(" {}", label));
} }
let mut additional_text_edits = Vec::new(); let mut additional_text_edits = Vec::new();
let mut text_edit = None; let mut text_edit = None;
// LSP does not allow arbitrary edits in completion, so we have to do a // LSP does not allow arbitrary edits in completion, so we have to do a
// non-trivial mapping here. // non-trivial mapping here.
let source_range = completion_item.source_range(); let source_range = item.source_range();
for indel in completion_item.text_edit().iter() { for indel in item.text_edit().iter() {
if indel.delete.contains_range(source_range) { if indel.delete.contains_range(source_range) {
text_edit = Some(if indel.delete == source_range { text_edit = Some(if indel.delete == source_range {
self::text_edit(line_index, indel.clone()) self::text_edit(line_index, indel.clone())
@ -207,46 +207,46 @@ pub(crate) fn completion_item(
} }
let text_edit = text_edit.unwrap(); let text_edit = text_edit.unwrap();
let mut res = lsp_types::CompletionItem { let mut lsp_item = lsp_types::CompletionItem {
label: completion_item.label().to_string(), label: item.label().to_string(),
detail: completion_item.detail().map(|it| it.to_string()), detail: item.detail().map(|it| it.to_string()),
filter_text: Some(completion_item.lookup().to_string()), filter_text: Some(item.lookup().to_string()),
kind: completion_item.kind().map(completion_item_kind), kind: item.kind().map(completion_item_kind),
text_edit: Some(text_edit.into()), text_edit: Some(text_edit.into()),
additional_text_edits: Some(additional_text_edits), additional_text_edits: Some(additional_text_edits),
documentation: completion_item.documentation().map(documentation), documentation: item.documentation().map(documentation),
deprecated: Some(completion_item.deprecated()), deprecated: Some(item.deprecated()),
..Default::default() ..Default::default()
}; };
if completion_item.score().is_some() { if item.score().is_some() {
set_score(&mut res, completion_item.label()); set_score(&mut lsp_item, item.label());
} }
if completion_item.deprecated() { if item.deprecated() {
res.tags = Some(vec![lsp_types::CompletionItemTag::Deprecated]) lsp_item.tags = Some(vec![lsp_types::CompletionItemTag::Deprecated])
} }
if completion_item.trigger_call_info() { if item.trigger_call_info() {
res.command = Some(command::trigger_parameter_hints()); lsp_item.command = Some(command::trigger_parameter_hints());
} }
let mut all_results = match completion_item.ref_match() { let mut res = match item.ref_match() {
Some(ref_match) => { Some(ref_match) => {
let mut refed = res.clone(); let mut refed = lsp_item.clone();
let (mutability, _score) = ref_match; let (mutability, _score) = ref_match;
let label = format!("&{}{}", mutability.as_keyword_for_ref(), refed.label); let label = format!("&{}{}", mutability.as_keyword_for_ref(), refed.label);
set_score(&mut refed, &label); set_score(&mut refed, &label);
refed.label = label; refed.label = label;
vec![res, refed] vec![lsp_item, refed]
} }
None => vec![res], None => vec![lsp_item],
}; };
for mut r in all_results.iter_mut() { for mut r in res.iter_mut() {
r.insert_text_format = Some(insert_text_format(completion_item.insert_text_format())); r.insert_text_format = Some(insert_text_format(item.insert_text_format()));
} }
all_results res
} }
pub(crate) fn signature_help( pub(crate) fn signature_help(