user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

suggest parameter name before function name

Browse source
This commit is contained in:
Vladyslav Katasonov 2021-02-16 05:55:47 +03:00 • committed by Aleksey Kladov
parent 3b75dda745
commit f915ab79fa
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/ide_assists/src/handlers/extract_variable.rs
View file

@ -176,9 +176,9 @@ impl Anchor {
fn suggest_variable_name(ctx: &AssistContext, expr: &ast::Expr) -> String {
// FIXME: account for existing names in the scope
suggest_name_from_func(expr)
suggest_name_from_param(ctx, expr)
.or_else(|| suggest_name_from_func(expr))
.or_else(|| suggest_name_from_method(expr))
.or_else(|| suggest_name_from_param(ctx, expr))
.or_else(|| suggest_name_by_type(ctx, expr))
.unwrap_or_else(|| "var_name".to_string())
}
@ -815,7 +815,7 @@ fn foo() {
}
#[test]
fn extract_var_function_name_has_precedence() {
fn extract_var_parameter_name_has_precedence_over_function() {
check_assist(
extract_variable,
r#"
@ -829,8 +829,8 @@ fn foo() {
fn bar(test: u32, size: u32)
fn foo() {
let $0symbol_size = symbol_size(1, 2);
bar(1, symbol_size);
let $0size = symbol_size(1, 2);
bar(1, size);
}
"#,
)