mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

feat: extract only expressions from format string

Browse source
This commit is contained in:
unvalley 2022-11-27 15:36:26 +09:00 • committed by Lukas Wirth
parent 29f3d7dee7
commit 285f09cfa8
1 changed files with 27 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
crates/ide-assists/src/handlers/extract_expressions_from_format_string.rs
View file

@ -121,15 +121,14 @@ pub(crate) fn extract_expressions_from_format_string(
let mut placeholder_idx = 1;
for extracted_args in extracted_args {
// remove expr from format string
args.push_str(", ");
match extracted_args {
Arg::Ident(s) | Arg::Expr(s) => {
Arg::Expr(s)=> {
args.push_str(", ");
// insert arg
args.push_str(&s);
}
Arg::Placeholder => {
args.push_str(", ");
// try matching with existing argument
match existing_args.next() {
Some(ea) => {
@ -142,6 +141,7 @@ pub(crate) fn extract_expressions_from_format_string(
}
}
}
Arg::Ident(_s) => (),
}
}
@ -292,6 +292,29 @@ fn main() {
fn main() {
print!("My name is {} {}"$0, stringify!(Paperino), x + x)
}
"#,
),
);
}
#[test]
fn extract_only_expressions() {
check_assist(
extract_expressions_from_format_string,
&add_macro_decl(
r#"
fn main() {
let var = 1 + 1;
print!("foobar {var} {var:?} {x$0 + x}")
}
"#,
),
&add_macro_decl(
r#"
fn main() {
let var = 1 + 1;
print!("foobar {var} {var:?} {}"$0, x + x)
}
"#,
),
);