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

include tabstops

Browse source
This commit is contained in:
Jeroen Vannevel 2022-01-07 13:17:21 +00:00
parent 778e71b15f
commit 4bcdb05325
No known key found for this signature in database
GPG key ID: 78EF5F52F38C49BD
1 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

27
crates/ide_assists/src/handlers/add_turbo_fish.rs
View file

@ -83,7 +83,6 @@ pub(crate) fn add_turbo_fish(acc: &mut Assists, ctx: &AssistContext) -> Option<(
matches!(param, hir::GenericParam::TypeParam(_) | hir::GenericParam::ConstParam(_))
})
.count();
let fish_head = std::iter::repeat("_").take(number_of_arguments).collect::<Vec<_>>().join(",");
acc.add(
AssistId("add_turbo_fish", AssistKind::RefactorRewrite),
@ -91,10 +90,12 @@ pub(crate) fn add_turbo_fish(acc: &mut Assists, ctx: &AssistContext) -> Option<(
ident.text_range(),
|builder| match ctx.config.snippet_cap {
Some(cap) => {
let snip = format!("::<${{0:{}}}>", fish_head);
let snip = format!("::<{}>", get_snippet_fish_head(number_of_arguments));
builder.insert_snippet(cap, ident.text_range().end(), snip)
}
None => {
let fish_head =
std::iter::repeat("_").take(number_of_arguments).collect::<Vec<_>>().join(", ");
let snip = format!("::<{}>", fish_head);
builder.insert(ident.text_range().end(), snip);
}
@ -102,6 +103,20 @@ pub(crate) fn add_turbo_fish(acc: &mut Assists, ctx: &AssistContext) -> Option<(
)
}
/// This will create a snippet string with tabstops marked
fn get_snippet_fish_head(number_of_arguments: usize) -> String {
let mut fish_head = String::new();
let mut i = 1;
while i < number_of_arguments {
fish_head.push_str(&format!("${{{}:_}},", i));
i = i + 1;
}
// tabstop 0 is a special case and always the last one
fish_head.push_str("${0:_}");
fish_head
}
#[cfg(test)]
mod tests {
use crate::tests::{check_assist, check_assist_by_label, check_assist_not_applicable};
@ -140,7 +155,7 @@ fn main() {
r#"
fn make<T, A>() -> T {}
fn main() {
make::<${0:_,_}>();
make::<${1:_},${0:_}>();
}
"#,
);
@ -159,7 +174,7 @@ fn main() {
r#"
fn make<T, A, B, C, D, E, F>() -> T {}
fn main() {
make::<${0:_,_,_,_,_,_,_}>();
make::<${1:_},${2:_},${3:_},${4:_},${5:_},${6:_},${0:_}>();
}
"#,
);
@ -358,7 +373,7 @@ fn main() {
r#"
fn make<'a, T, A>(t: T, a: A) {}
fn main() {
make::<${0:_,_}>(5, 2);
make::<${1:_},${0:_}>(5, 2);
}
"#,
);
@ -377,7 +392,7 @@ fn main() {
r#"
fn make<T, const N: usize>(t: T) {}
fn main() {
make::<${0:_,_}>(3);
make::<${1:_},${0:_}>(3);
}
"#,
);