Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-28 14:03:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

Properly use final tabstop when adding missing match arms

Browse source
This commit is contained in:
Giga Bowser 2024-11-05 12:13:42 -05:00
parent 92b2b3d26b
commit 494bde3c13
2 changed files with 66 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

121
crates/ide-assists/src/handlers/add_missing_match_arms.rs
View file

@ -31,7 +31,7 @@ use crate::{utils, AssistContext, AssistId, AssistKind, Assists};
// fn handle(action: Action) { // fn handle(action: Action) {
// match action { // match action {
// Action::Move { distance } => ${1:todo!()}, // Action::Move { distance } => ${1:todo!()},
// Action::Stop => ${0:todo!()}, // Action::Stop => ${2:todo!()},$0
// } // }
// } // }
// ``` // ```
@ -234,12 +234,11 @@ pub(crate) fn add_missing_match_arms(acc: &mut Assists, ctx: &AssistContext<'_>)
} }
} }
let mut added_arms = Vec::new();
let mut todo_placeholders = Vec::new(); let mut todo_placeholders = Vec::new();
let mut first_new_arm = None;
for arm in missing_arms { for arm in missing_arms {
todo_placeholders.push(arm.expr().unwrap()); todo_placeholders.push(arm.expr().unwrap());
first_new_arm.get_or_insert_with(|| arm.clone()); added_arms.push(arm);
new_match_arm_list.add_arm(arm);
} }
if needs_catch_all_arm && !has_catch_all_arm { if needs_catch_all_arm && !has_catch_all_arm {
@ -251,18 +250,28 @@ pub(crate) fn add_missing_match_arms(acc: &mut Assists, ctx: &AssistContext<'_>)
) )
.clone_for_update(); .clone_for_update();
todo_placeholders.push(arm.expr().unwrap()); todo_placeholders.push(arm.expr().unwrap());
first_new_arm.get_or_insert_with(|| arm.clone()); added_arms.push(arm);
}
let first_new_arm = added_arms.first().cloned();
let last_new_arm = added_arms.last().cloned();
for arm in added_arms {
new_match_arm_list.add_arm(arm); new_match_arm_list.add_arm(arm);
} }
if let (Some(first_new_arm), Some(cap)) = (first_new_arm, ctx.config.snippet_cap) { if let Some(cap) = ctx.config.snippet_cap {
if let Some(it) = first_new_arm.syntax().descendants().find_map(ast::WildcardPat::cast) { if let Some(it) = first_new_arm.and_then(|arm| arm.syntax().descendants().find_map(ast::WildcardPat::cast)) {
edit.add_placeholder_snippet(cap, it); edit.add_placeholder_snippet(cap, it);
} }
for placeholder in todo_placeholders { for placeholder in todo_placeholders {
edit.add_placeholder_snippet(cap, placeholder); edit.add_placeholder_snippet(cap, placeholder);
} }
if let Some(arm) = last_new_arm {
edit.add_tabstop_after(cap, arm);
}
} }
// FIXME: Hack for mutable syntax trees not having great support for macros // FIXME: Hack for mutable syntax trees not having great support for macros
@ -588,7 +597,7 @@ fn foo(a: bool) {
fn foo(a: bool) { fn foo(a: bool) {
match a { match a {
true => ${1:todo!()}, true => ${1:todo!()},
false => ${0:todo!()}, false => ${2:todo!()},$0
} }
} }
"#, "#,
@ -610,7 +619,7 @@ fn foo(a: bool) {
fn foo(a: bool) { fn foo(a: bool) {
match a { match a {
true => {} true => {}
false => ${0:todo!()}, false => ${1:todo!()},$0
} }
} }
"#, "#,
@ -663,7 +672,7 @@ fn foo(a: bool) {
(true, true) => ${1:todo!()}, (true, true) => ${1:todo!()},
(true, false) => ${2:todo!()}, (true, false) => ${2:todo!()},
(false, true) => ${3:todo!()}, (false, true) => ${3:todo!()},
(false, false) => ${0:todo!()}, (false, false) => ${4:todo!()},$0
} }
} }
"#, "#,
@ -684,7 +693,7 @@ fn foo(a: bool) {
fn foo(a: bool) { fn foo(a: bool) {
match [a] { match [a] {
[true] => ${1:todo!()}, [true] => ${1:todo!()},
[false] => ${0:todo!()}, [false] => ${2:todo!()},$0
} }
} }
"#, "#,
@ -702,7 +711,7 @@ fn foo(a: bool) {
fn foo(a: bool) { fn foo(a: bool) {
match [a,] { match [a,] {
[true] => ${1:todo!()}, [true] => ${1:todo!()},
[false] => ${0:todo!()}, [false] => ${2:todo!()},$0
} }
} }
"#, "#,
@ -723,7 +732,7 @@ fn foo(a: bool) {
[true, true] => todo!(), [true, true] => todo!(),
[true, false] => ${1:todo!()}, [true, false] => ${1:todo!()},
[false, true] => ${2:todo!()}, [false, true] => ${2:todo!()},
[false, false] => ${0:todo!()}, [false, false] => ${3:todo!()},$0
} }
} }
"#, "#,
@ -743,7 +752,7 @@ fn foo(a: bool) {
[true, true] => ${1:todo!()}, [true, true] => ${1:todo!()},
[true, false] => ${2:todo!()}, [true, false] => ${2:todo!()},
[false, true] => ${3:todo!()}, [false, true] => ${3:todo!()},
[false, false] => ${0:todo!()}, [false, false] => ${4:todo!()},$0
} }
} }
"#, "#,
@ -766,7 +775,7 @@ fn foo(a: bool) {
match (a, a) { match (a, a) {
(true | false, true) => {} (true | false, true) => {}
(true, false) => ${1:todo!()}, (true, false) => ${1:todo!()},
(false, false) => ${0:todo!()}, (false, false) => ${2:todo!()},$0
} }
} }
"#, "#,
@ -787,7 +796,7 @@ fn foo(a: bool) {
(false, true) => {} (false, true) => {}
(true, true) => ${1:todo!()}, (true, true) => ${1:todo!()},
(true, false) => ${2:todo!()}, (true, false) => ${2:todo!()},
(false, false) => ${0:todo!()}, (false, false) => ${3:todo!()},$0
} }
} }
"#, "#,
@ -821,7 +830,7 @@ fn main() {
match A::As { match A::As {
A::Bs { x, y: Some(_) } => {} A::Bs { x, y: Some(_) } => {}
A::Cs(_, Some(_)) => {} A::Cs(_, Some(_)) => {}
A::As => ${0:todo!()}, A::As => ${1:todo!()},$0
} }
} }
"#, "#,
@ -844,7 +853,7 @@ fn main() {
fn main() { fn main() {
match None { match None {
None => {} None => {}
Some(${1:_}) => ${0:todo!()}, Some(${1:_}) => ${2:todo!()},$0
} }
} }
"#, "#,
@ -868,7 +877,7 @@ enum A { As, Bs, Cs(Option<i32>) }
fn main() { fn main() {
match A::As { match A::As {
A::Cs(_) | A::Bs => {} A::Cs(_) | A::Bs => {}
A::As => ${0:todo!()}, A::As => ${1:todo!()},$0
} }
} }
"#, "#,
@ -899,7 +908,7 @@ fn main() {
A::Ds(_value) => { let x = 1; } A::Ds(_value) => { let x = 1; }
A::Es(B::Xs) => (), A::Es(B::Xs) => (),
A::As => ${1:todo!()}, A::As => ${1:todo!()},
A::Cs => ${0:todo!()}, A::Cs => ${2:todo!()},$0
} }
} }
"#, "#,
@ -925,7 +934,7 @@ fn main() {
match A::As { match A::As {
A::As(_) => {} A::As(_) => {}
a @ A::Bs(_) => {} a @ A::Bs(_) => {}
A::Cs(${1:_}) => ${0:todo!()}, A::Cs(${1:_}) => ${2:todo!()},$0
} }
} }
"#, "#,
@ -955,7 +964,7 @@ fn main() {
A::Bs => ${2:todo!()}, A::Bs => ${2:todo!()},
A::Cs(_) => ${3:todo!()}, A::Cs(_) => ${3:todo!()},
A::Ds(_, _) => ${4:todo!()}, A::Ds(_, _) => ${4:todo!()},
A::Es { x, y } => ${0:todo!()}, A::Es { x, y } => ${5:todo!()},$0
} }
} }
"#, "#,
@ -990,7 +999,7 @@ fn main() {
(A::Two, B::One) => {}, (A::Two, B::One) => {},
(A::One, B::One) => ${1:todo!()}, (A::One, B::One) => ${1:todo!()},
(A::One, B::Two) => ${2:todo!()}, (A::One, B::Two) => ${2:todo!()},
(A::Two, B::Two) => ${0:todo!()}, (A::Two, B::Two) => ${3:todo!()},$0
} }
} }
"#, "#,
@ -1022,7 +1031,7 @@ fn main() {
(A::One, B::One) => ${1:todo!()}, (A::One, B::One) => ${1:todo!()},
(A::One, B::Two) => ${2:todo!()}, (A::One, B::Two) => ${2:todo!()},
(A::Two, B::One) => ${3:todo!()}, (A::Two, B::One) => ${3:todo!()},
(A::Two, B::Two) => ${0:todo!()}, (A::Two, B::Two) => ${4:todo!()},$0
} }
} }
"#, "#,
@ -1054,7 +1063,7 @@ fn main() {
(A::One, B::One) => ${1:todo!()}, (A::One, B::One) => ${1:todo!()},
(A::One, B::Two) => ${2:todo!()}, (A::One, B::Two) => ${2:todo!()},
(A::Two, B::One) => ${3:todo!()}, (A::Two, B::One) => ${3:todo!()},
(A::Two, B::Two) => ${0:todo!()}, (A::Two, B::Two) => ${4:todo!()},$0
} }
} }
"#, "#,
@ -1088,7 +1097,7 @@ fn main() {
(A::Two, B::One) => {} (A::Two, B::One) => {}
(A::One, B::One) => ${1:todo!()}, (A::One, B::One) => ${1:todo!()},
(A::One, B::Two) => ${2:todo!()}, (A::One, B::Two) => ${2:todo!()},
(A::Two, B::Two) => ${0:todo!()}, (A::Two, B::Two) => ${3:todo!()},$0
} }
} }
"#, "#,
@ -1115,7 +1124,7 @@ fn main() {
(A | B | C , B | C, A | B | C) => (), (A | B | C , B | C, A | B | C) => (),
(C, A, A) => ${1:todo!()}, (C, A, A) => ${1:todo!()},
(C, A, B) => ${2:todo!()}, (C, A, B) => ${2:todo!()},
(C, A, C) => ${0:todo!()}, (C, A, C) => ${3:todo!()},$0
} }
} }
"#, "#,
@ -1144,7 +1153,7 @@ fn main() {
match (a, b) { match (a, b) {
(Some(_), _) => {} (Some(_), _) => {}
(None, Some(_)) => {} (None, Some(_)) => {}
(None, None) => ${0:todo!()}, (None, None) => ${1:todo!()},$0
} }
} }
"#, "#,
@ -1210,7 +1219,7 @@ fn main() {
let a = A::One; let a = A::One;
match (a, ) { match (a, ) {
(A::One,) => ${1:todo!()}, (A::One,) => ${1:todo!()},
(A::Two,) => ${0:todo!()}, (A::Two,) => ${2:todo!()},$0
} }
} }
"#, "#,
@ -1234,7 +1243,7 @@ enum A { As }
fn foo(a: &A) { fn foo(a: &A) {
match a { match a {
A::As => ${0:todo!()}, A::As => ${1:todo!()},$0
} }
} }
"#, "#,
@ -1259,7 +1268,7 @@ enum A {
fn foo(a: &mut A) { fn foo(a: &mut A) {
match a { match a {
A::Es { x, y } => ${0:todo!()}, A::Es { x, y } => ${1:todo!()},$0
} }
} }
"#, "#,
@ -1320,7 +1329,7 @@ enum E { X, Y }
fn main() { fn main() {
match E::X { match E::X {
E::X => ${1:todo!()}, E::X => ${1:todo!()},
E::Y => ${0:todo!()}, E::Y => ${2:todo!()},$0
} }
} }
"#, "#,
@ -1367,7 +1376,7 @@ use foo::E::X;
fn main() { fn main() {
match X { match X {
X => ${1:todo!()}, X => ${1:todo!()},
foo::E::Y => ${0:todo!()}, foo::E::Y => ${2:todo!()},$0
} }
} }
"#, "#,
@ -1394,7 +1403,7 @@ fn foo(a: A) {
match a { match a {
// foo bar baz // foo bar baz
A::One => {} A::One => {}
A::Two => ${0:todo!()}, A::Two => ${1:todo!()},$0
// This is where the rest should be // This is where the rest should be
} }
} }
@ -1419,7 +1428,7 @@ enum A { One, Two }
fn foo(a: A) { fn foo(a: A) {
match a { match a {
A::One => ${1:todo!()}, A::One => ${1:todo!()},
A::Two => ${0:todo!()}, A::Two => ${2:todo!()},$0
// foo bar baz // foo bar baz
} }
} }
@ -1444,7 +1453,7 @@ enum A { One, Two, }
fn foo(a: A) { fn foo(a: A) {
match a { match a {
A::One => ${1:todo!()}, A::One => ${1:todo!()},
A::Two => ${0:todo!()}, A::Two => ${2:todo!()},$0
} }
} }
"#, "#,
@ -1467,7 +1476,7 @@ fn foo(opt: Option<i32>) {
fn foo(opt: Option<i32>) { fn foo(opt: Option<i32>) {
match opt { match opt {
Some(${1:_}) => ${2:todo!()}, Some(${1:_}) => ${2:todo!()},
None => ${0:todo!()}, None => ${3:todo!()},$0
} }
} }
"#, "#,
@ -1501,7 +1510,7 @@ fn foo(t: Test) {
m!(match t { m!(match t {
Test::A => ${1:todo!()}, Test::A => ${1:todo!()},
Test::B => ${2:todo!()}, Test::B => ${2:todo!()},
Test::C => ${0:todo!()}, Test::C => ${3:todo!()},$0
}); });
}"#, }"#,
); );
@ -1536,7 +1545,7 @@ fn foo(t: bool) {
fn foo(t: bool) { fn foo(t: bool) {
match t { match t {
true => 1 + 2, true => 1 + 2,
false => ${0:todo!()}, false => ${1:todo!()},$0
} }
}"#, }"#,
); );
@ -1556,7 +1565,7 @@ fn foo(t: bool) {
fn foo(t: bool) { fn foo(t: bool) {
match t { match t {
true => 1 + 2, true => 1 + 2,
false => ${0:todo!()}, false => ${1:todo!()},$0
} }
}"#, }"#,
); );
@ -1578,7 +1587,7 @@ fn foo(t: bool) {
match t { match t {
_ => 1 + 2, _ => 1 + 2,
true => ${1:todo!()}, true => ${1:todo!()},
false => ${0:todo!()}, false => ${2:todo!()},$0
} }
}"#, }"#,
); );
@ -1602,7 +1611,7 @@ pub enum E { A, #[doc(hidden)] B, }
fn foo(t: ::e::E) { fn foo(t: ::e::E) {
match t { match t {
e::E::A => ${1:todo!()}, e::E::A => ${1:todo!()},
_ => ${0:todo!()}, _ => ${2:todo!()},$0
} }
} }
"#, "#,
@ -1628,7 +1637,7 @@ fn foo(t: (bool, ::e::E)) {
match t { match t {
(true, e::E::A) => ${1:todo!()}, (true, e::E::A) => ${1:todo!()},
(false, e::E::A) => ${2:todo!()}, (false, e::E::A) => ${2:todo!()},
_ => ${0:todo!()}, _ => ${3:todo!()},$0
} }
} }
"#, "#,
@ -1652,7 +1661,7 @@ pub enum E { #[doc(hidden)] A, }
r#" r#"
fn foo(t: ::e::E) { fn foo(t: ::e::E) {
match t { match t {
${1:_} => ${0:todo!()}, ${1:_} => ${2:todo!()},$0
} }
} }
"#, "#,
@ -1713,7 +1722,7 @@ pub enum E { A, }
fn foo(t: ::e::E) { fn foo(t: ::e::E) {
match t { match t {
e::E::A => todo!(), e::E::A => todo!(),
${1:_} => ${0:todo!()}, ${1:_} => ${2:todo!()},$0
} }
} }
"#, "#,
@ -1739,7 +1748,7 @@ pub enum E { A, }
fn foo(t: ::e::E) { fn foo(t: ::e::E) {
match t { match t {
e::E::A => ${1:todo!()}, e::E::A => ${1:todo!()},
_ => ${0:todo!()}, _ => ${2:todo!()},$0
} }
} }
"#, "#,
@ -1764,7 +1773,7 @@ pub enum E { A, #[doc(hidden)] B }"#,
fn foo(t: ::e::E) { fn foo(t: ::e::E) {
match t { match t {
e::E::A => ${1:todo!()}, e::E::A => ${1:todo!()},
_ => ${0:todo!()}, _ => ${2:todo!()},$0
} }
} }
"#, "#,
@ -1790,7 +1799,7 @@ pub enum E { A, #[doc(hidden)] B }"#,
fn foo(t: ::e::E) { fn foo(t: ::e::E) {
match t { match t {
e::E::A => todo!(), e::E::A => todo!(),
${1:_} => ${0:todo!()}, ${1:_} => ${2:todo!()},$0
} }
} }
"#, "#,
@ -1815,7 +1824,7 @@ pub enum E { #[doc(hidden)] A, }"#,
fn foo(t: ::e::E, b: bool) { fn foo(t: ::e::E, b: bool) {
match t { match t {
_ if b => todo!(), _ if b => todo!(),
${1:_} => ${0:todo!()}, ${1:_} => ${2:todo!()},$0
} }
} }
"#, "#,
@ -1857,7 +1866,7 @@ pub enum E { A, #[doc(hidden)] B, }"#,
fn foo(t: ::e::E) { fn foo(t: ::e::E) {
match t { match t {
e::E::A => ${1:todo!()}, e::E::A => ${1:todo!()},
_ => ${0:todo!()}, _ => ${2:todo!()},$0
} }
} }
"#, "#,
@ -1881,7 +1890,7 @@ enum E { A, #[doc(hidden)] B, }
fn foo(t: E) { fn foo(t: E) {
match t { match t {
E::A => ${1:todo!()}, E::A => ${1:todo!()},
E::B => ${0:todo!()}, E::B => ${2:todo!()},$0
} }
}"#, }"#,
); );
@ -1906,7 +1915,7 @@ enum E { A, B, }
fn foo(t: E) { fn foo(t: E) {
match t { match t {
E::A => ${1:todo!()}, E::A => ${1:todo!()},
E::B => ${0:todo!()}, E::B => ${2:todo!()},$0
} }
}"#, }"#,
); );
@ -1931,7 +1940,7 @@ enum E { A, #[doc(hidden)] B, }
fn foo(t: E) { fn foo(t: E) {
match t { match t {
E::A => ${1:todo!()}, E::A => ${1:todo!()},
E::B => ${0:todo!()}, E::B => ${2:todo!()},$0
} }
}"#, }"#,
); );
@ -1982,7 +1991,7 @@ fn a() {
let b = A::A; let b = A::A;
match b { match b {
A::A => ${1:todo!()}, A::A => ${1:todo!()},
A::Missing { a, u32, c } => ${0:todo!()}, A::Missing { a, u32, c } => ${2:todo!()},$0
} }
}"#, }"#,
) )
@ -2020,7 +2029,7 @@ fn f() {
let value = E::A; let value = E::A;
match value { match value {
E::A => ${1:todo!()}, E::A => ${1:todo!()},
E::B(s) => ${0:todo!()}, E::B(s) => ${2:todo!()},$0
} }
} }
"#, "#,
@ -2058,7 +2067,7 @@ fn f() {
let value = E::A; let value = E::A;
match value { match value {
E::A => ${1:todo!()}, E::A => ${1:todo!()},
E::B(s1, s2) => ${0:todo!()}, E::B(s1, s2) => ${2:todo!()},$0
} }
} }
"#, "#,

2
crates/ide-assists/src/tests/generated.rs
View file

@ -188,7 +188,7 @@ enum Action { Move { distance: u32 }, Stop }
fn handle(action: Action) { fn handle(action: Action) {
match action { match action {
Action::Move { distance } => ${1:todo!()}, Action::Move { distance } => ${1:todo!()},
Action::Stop => ${0:todo!()}, Action::Stop => ${2:todo!()},$0
} }
} }
"#####, "#####,