diff options
| -rw-r--r-- | crates/ide-assists/src/handlers/extract_variable.rs | 36 |
1 files changed, 31 insertions, 5 deletions
diff --git a/crates/ide-assists/src/handlers/extract_variable.rs b/crates/ide-assists/src/handlers/extract_variable.rs index 71fa3ac3349..500db158e6f 100644 --- a/crates/ide-assists/src/handlers/extract_variable.rs +++ b/crates/ide-assists/src/handlers/extract_variable.rs @@ -58,6 +58,12 @@ pub(crate) fn extract_variable(acc: &mut Assists, ctx: &AssistContext) -> Option _ => "", }; + let parent_ref_expr = to_extract.syntax().parent().and_then(ast::RefExpr::cast); + let var_modifier = match parent_ref_expr { + Some(expr) if expr.mut_token().is_some() => "mut ", + _ => "", + }; + let anchor = Anchor::from(&to_extract)?; let indent = anchor.syntax().prev_sibling_or_token()?.as_token()?.clone(); let target = to_extract.syntax().text_range(); @@ -85,7 +91,7 @@ pub(crate) fn extract_variable(acc: &mut Assists, ctx: &AssistContext) -> Option match anchor { Anchor::Before(_) | Anchor::Replace(_) => { - format_to!(buf, "let {} = {}", var_name, reference_modifier) + format_to!(buf, "let {}{} = {}", var_modifier, var_name, reference_modifier) } Anchor::WrapInBlock(_) => { format_to!(buf, "{{ let {} = {}", var_name, reference_modifier) @@ -100,8 +106,10 @@ pub(crate) fn extract_variable(acc: &mut Assists, ctx: &AssistContext) -> Option } match ctx.config.snippet_cap { Some(cap) => { - let snip = buf - .replace(&format!("let {}", var_name), &format!("let $0{}", var_name)); + let snip = buf.replace( + &format!("let {}{}", var_modifier, var_name), + &format!("let {}$0{}", var_modifier, var_name), + ); edit.replace_snippet(cap, expr_range, snip) } None => edit.replace(expr_range, buf), @@ -126,8 +134,10 @@ pub(crate) fn extract_variable(acc: &mut Assists, ctx: &AssistContext) -> Option let offset = anchor.syntax().text_range().start(); match ctx.config.snippet_cap { Some(cap) => { - let snip = - buf.replace(&format!("let {}", var_name), &format!("let $0{}", var_name)); + let snip = buf.replace( + &format!("let {}{}", var_modifier, var_name), + &format!("let {}$0{}", var_modifier, var_name), + ); edit.insert_snippet(cap, offset, snip) } None => edit.insert(offset, buf), @@ -1250,4 +1260,20 @@ fn foo() { }"#, ); } + + #[test] + fn test_extract_var_for_mutable_borrow() { + check_assist( + extract_variable, + r#" +fn foo() { + let v = &mut $00$0; +}"#, + r#" +fn foo() { + let mut $0var_name = 0; + let v = &mut var_name; +}"#, + ); + } } |