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

Deunwrap add_missing_match_arms

Browse source
This commit is contained in:
Ali Bektas 2023-09-11 14:09:19 +02:00
parent 326f37ef1f
commit 145a101fe8
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -273,9 +273,10 @@ pub(crate) fn add_missing_match_arms(acc: &mut Assists, ctx: &AssistContext<'_>)
syntax::SyntaxElement::Token(it) => { syntax::SyntaxElement::Token(it) => {
// Don't have a way to make tokens mut, so instead make the parent mut // Don't have a way to make tokens mut, so instead make the parent mut
// and find the token again // and find the token again
let parent = edit.make_syntax_mut(it.parent().unwrap()); let parent =
edit.make_syntax_mut(it.parent().expect("Token must have a parent."));
let mut_token = let mut_token =
parent.covering_element(it.text_range()).into_token().unwrap(); parent.covering_element(it.text_range()).into_token().expect("Covering element cannot be found. Range may be beyond the current node's range");
syntax::SyntaxElement::from(mut_token) syntax::SyntaxElement::from(mut_token)
} }
@ -446,21 +447,23 @@ fn build_pat(
mod_path_to_ast(&module.find_use_path(db, ModuleDef::from(var), prefer_no_std)?); mod_path_to_ast(&module.find_use_path(db, ModuleDef::from(var), prefer_no_std)?);
// FIXME: use HIR for this; it doesn't currently expose struct vs. tuple vs. unit variants though // FIXME: use HIR for this; it doesn't currently expose struct vs. tuple vs. unit variants though
let pat: ast::Pat = match var.source(db)?.value.kind() { Some(match var.source(db)?.value.kind() {
ast::StructKind::Tuple(field_list) => { ast::StructKind::Tuple(field_list) => {
let pats = let pats =
iter::repeat(make::wildcard_pat().into()).take(field_list.fields().count()); iter::repeat(make::wildcard_pat().into()).take(field_list.fields().count());
make::tuple_struct_pat(path, pats).into() make::tuple_struct_pat(path, pats).into()
} }
ast::StructKind::Record(field_list) => { ast::StructKind::Record(field_list) => {
let pats = field_list let pats = field_list.fields().map(|f| {
.fields() make::ext::simple_ident_pat(
.map(|f| make::ext::simple_ident_pat(f.name().unwrap()).into()); f.name().expect("Record field must have a name"),
)
.into()
});
make::record_pat(path, pats).into() make::record_pat(path, pats).into()
} }
ast::StructKind::Unit => make::path_pat(path), ast::StructKind::Unit => make::path_pat(path),
}; })
Some(pat)
} }
ExtendedVariant::True => Some(ast::Pat::from(make::literal_pat("true"))), ExtendedVariant::True => Some(ast::Pat::from(make::literal_pat("true"))),
ExtendedVariant::False => Some(ast::Pat::from(make::literal_pat("false"))), ExtendedVariant::False => Some(ast::Pat::from(make::literal_pat("false"))),