language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-03 15:15:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

refactor: apply review suggestions

Browse source
This commit is contained in:
Eduardo Canellas 2022-01-04 19:30:57 -03:00
parent 30b7e92afa
commit a973e5a9db
1 changed files with 21 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

35
crates/ide_completion/src/completions/fn_param.rs
View file

@ -59,7 +59,7 @@ pub(crate) fn complete_fn_param(acc: &mut Completions, ctx: &CompletionContext)
let function = ctx.token.ancestors().find_map(ast::Fn::cast)?; let function = ctx.token.ancestors().find_map(ast::Fn::cast)?;
let param_list = function.param_list()?; let param_list = function.param_list()?;
remove_duplicated(&mut file_params, param_list.params())?; remove_duplicated(&mut file_params, param_list.params());
let self_completion_items = ["self", "&self", "mut self", "&mut self"]; let self_completion_items = ["self", "&self", "mut self", "&mut self"];
if should_add_self_completions(ctx, param_list) { if should_add_self_completions(ctx, param_list) {
@ -69,7 +69,7 @@ pub(crate) fn complete_fn_param(acc: &mut Completions, ctx: &CompletionContext)
} }
file_params.into_iter().try_for_each(|(whole_param, binding)| { file_params.into_iter().try_for_each(|(whole_param, binding)| {
Some(add_new_item_to_acc(ctx, acc, surround_with_commas(ctx, whole_param)?, binding)) Some(add_new_item_to_acc(ctx, acc, surround_with_commas(ctx, whole_param), binding))
})?; })?;
Some(()) Some(())
@ -77,16 +77,16 @@ pub(crate) fn complete_fn_param(acc: &mut Completions, ctx: &CompletionContext)
fn remove_duplicated( fn remove_duplicated(
file_params: &mut FxHashMap<String, String>, file_params: &mut FxHashMap<String, String>,
mut fn_params: ast::AstChildren<ast::Param>, fn_params: ast::AstChildren<ast::Param>,
) -> Option<()> { ) {
fn_params.try_for_each(|param| { fn_params.for_each(|param| {
let whole_param = param.syntax().text().to_string(); let whole_param = param.syntax().text().to_string();
file_params.remove(&whole_param); file_params.remove(&whole_param);
let binding = param.pat()?.syntax().text().to_string(); if let Some(pattern) = param.pat() {
let binding = pattern.syntax().text().to_string();
file_params.retain(|_, v| v != &binding); file_params.retain(|_, v| v != &binding);
Some(()) }
}) })
} }
@ -97,13 +97,20 @@ fn should_add_self_completions(ctx: &CompletionContext, param_list: ast::ParamLi
inside_impl && no_params inside_impl && no_params
} }
fn surround_with_commas(ctx: &CompletionContext, param: String) -> Option<String> { fn surround_with_commas(ctx: &CompletionContext, param: String) -> String {
match fallible_surround_with_commas(ctx, &param) {
Some(surrounded) => surrounded,
// fallback to the original parameter
None => param,
}
}
fn fallible_surround_with_commas(ctx: &CompletionContext, param: &str) -> Option<String> {
let next_token = { let next_token = {
let t = ctx.token.next_token()?; let t = ctx.token.next_token()?;
if !matches!(t.kind(), SyntaxKind::WHITESPACE) { match t.kind() {
t SyntaxKind::WHITESPACE => t.next_token()?,
} else { _ => t,
t.next_token()?
} }
}; };