2020-03-17 18:02:39 -05:00
|
|
|
use std::iter;
|
2019-02-03 12:26:35 -06:00
|
|
|
|
2020-03-22 17:19:55 -05:00
|
|
|
use hir::{Adt, HasSource, ModuleDef, Semantics};
|
2020-03-23 07:19:09 -05:00
|
|
|
use itertools::Itertools;
|
2020-03-19 06:36:33 -05:00
|
|
|
use ra_ide_db::RootDatabase;
|
2020-03-31 07:52:20 -05:00
|
|
|
use ra_syntax::ast::{self, make, AstNode, MatchArm, NameOwner, Pat};
|
2020-05-20 05:59:20 -05:00
|
|
|
use test_utils::mark;
|
2019-02-03 12:26:35 -06:00
|
|
|
|
2020-05-20 07:00:37 -05:00
|
|
|
use crate::{
|
|
|
|
utils::{render_snippet, Cursor, FamousDefs},
|
|
|
|
AssistContext, AssistId, Assists,
|
|
|
|
};
|
2019-06-23 23:05:50 -05:00
|
|
|
|
2019-10-26 09:37:04 -05:00
|
|
|
// Assist: fill_match_arms
|
|
|
|
//
|
|
|
|
// Adds missing clauses to a `match` expression.
|
|
|
|
//
|
|
|
|
// ```
|
|
|
|
// enum Action { Move { distance: u32 }, Stop }
|
|
|
|
//
|
|
|
|
// fn handle(action: Action) {
|
|
|
|
// match action {
|
|
|
|
// <|>
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
// ```
|
|
|
|
// ->
|
|
|
|
// ```
|
|
|
|
// enum Action { Move { distance: u32 }, Stop }
|
|
|
|
//
|
|
|
|
// fn handle(action: Action) {
|
|
|
|
// match action {
|
2020-05-20 07:00:37 -05:00
|
|
|
// $0Action::Move { distance } => {}
|
2020-03-23 21:23:30 -05:00
|
|
|
// Action::Stop => {}
|
2019-10-26 09:37:04 -05:00
|
|
|
// }
|
|
|
|
// }
|
|
|
|
// ```
|
2020-05-06 11:45:35 -05:00
|
|
|
pub(crate) fn fill_match_arms(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
|
2019-10-27 03:48:40 -05:00
|
|
|
let match_expr = ctx.find_node_at_offset::<ast::MatchExpr>()?;
|
2019-08-22 13:31:21 -05:00
|
|
|
let match_arm_list = match_expr.match_arm_list()?;
|
2019-02-03 12:26:35 -06:00
|
|
|
|
|
|
|
let expr = match_expr.expr()?;
|
2020-01-10 14:42:04 -06:00
|
|
|
|
2020-03-17 14:26:55 -05:00
|
|
|
let mut arms: Vec<MatchArm> = match_arm_list.arms().collect();
|
|
|
|
if arms.len() == 1 {
|
|
|
|
if let Some(Pat::PlaceholderPat(..)) = arms[0].pat() {
|
|
|
|
arms.clear();
|
2020-03-17 01:30:25 -05:00
|
|
|
}
|
2020-03-17 14:26:55 -05:00
|
|
|
}
|
2020-03-17 01:30:25 -05:00
|
|
|
|
2020-03-23 00:42:32 -05:00
|
|
|
let module = ctx.sema.scope(expr.syntax()).module()?;
|
|
|
|
|
|
|
|
let missing_arms: Vec<MatchArm> = if let Some(enum_def) = resolve_enum_def(&ctx.sema, &expr) {
|
|
|
|
let variants = enum_def.variants(ctx.db);
|
|
|
|
|
2020-05-20 03:51:48 -05:00
|
|
|
let mut variants = variants
|
2020-03-23 00:42:32 -05:00
|
|
|
.into_iter()
|
|
|
|
.filter_map(|variant| build_pat(ctx.db, module, variant))
|
|
|
|
.filter(|variant_pat| is_variant_missing(&mut arms, variant_pat))
|
2020-03-23 21:23:30 -05:00
|
|
|
.map(|pat| make::match_arm(iter::once(pat), make::expr_empty_block()))
|
2020-05-20 03:51:48 -05:00
|
|
|
.collect::<Vec<_>>();
|
|
|
|
if Some(enum_def) == FamousDefs(&ctx.sema, module.krate()).core_option_Option() {
|
|
|
|
// Match `Some` variant first.
|
2020-05-20 05:59:20 -05:00
|
|
|
mark::hit!(option_order);
|
2020-05-20 03:51:48 -05:00
|
|
|
variants.reverse()
|
|
|
|
}
|
|
|
|
variants
|
2020-03-23 00:42:32 -05:00
|
|
|
} else if let Some(enum_defs) = resolve_tuple_of_enum_def(&ctx.sema, &expr) {
|
2020-03-23 07:19:09 -05:00
|
|
|
// Partial fill not currently supported for tuple of enums.
|
2020-03-23 00:42:32 -05:00
|
|
|
if !arms.is_empty() {
|
|
|
|
return None;
|
|
|
|
}
|
|
|
|
|
2020-03-23 07:19:09 -05:00
|
|
|
// We do not currently support filling match arms for a tuple
|
|
|
|
// containing a single enum.
|
|
|
|
if enum_defs.len() < 2 {
|
|
|
|
return None;
|
|
|
|
}
|
|
|
|
|
|
|
|
// When calculating the match arms for a tuple of enums, we want
|
|
|
|
// to create a match arm for each possible combination of enum
|
|
|
|
// values. The `multi_cartesian_product` method transforms
|
|
|
|
// Vec<Vec<EnumVariant>> into Vec<(EnumVariant, .., EnumVariant)>
|
|
|
|
// where each tuple represents a proposed match arm.
|
2020-03-23 00:42:32 -05:00
|
|
|
enum_defs
|
|
|
|
.into_iter()
|
|
|
|
.map(|enum_def| enum_def.variants(ctx.db))
|
|
|
|
.multi_cartesian_product()
|
|
|
|
.map(|variants| {
|
2020-03-23 07:19:09 -05:00
|
|
|
let patterns =
|
|
|
|
variants.into_iter().filter_map(|variant| build_pat(ctx.db, module, variant));
|
2020-03-23 00:42:32 -05:00
|
|
|
ast::Pat::from(make::tuple_pat(patterns))
|
|
|
|
})
|
|
|
|
.filter(|variant_pat| is_variant_missing(&mut arms, variant_pat))
|
2020-03-23 21:23:30 -05:00
|
|
|
.map(|pat| make::match_arm(iter::once(pat), make::expr_empty_block()))
|
2020-03-23 00:42:32 -05:00
|
|
|
.collect()
|
|
|
|
} else {
|
|
|
|
return None;
|
|
|
|
};
|
2020-03-17 01:30:25 -05:00
|
|
|
|
2020-03-17 18:02:39 -05:00
|
|
|
if missing_arms.is_empty() {
|
2020-03-17 14:26:55 -05:00
|
|
|
return None;
|
|
|
|
}
|
|
|
|
|
2020-05-06 05:51:28 -05:00
|
|
|
let target = match_expr.syntax().text_range();
|
2020-05-20 07:00:37 -05:00
|
|
|
acc.add(AssistId("fill_match_arms"), "Fill match arms", target, |builder| {
|
|
|
|
let new_arm_list = match_arm_list.remove_placeholder();
|
|
|
|
let n_old_arms = new_arm_list.arms().count();
|
|
|
|
let new_arm_list = new_arm_list.append_arms(missing_arms);
|
|
|
|
let first_new_arm = new_arm_list.arms().nth(n_old_arms);
|
|
|
|
let old_range = match_arm_list.syntax().text_range();
|
|
|
|
match (first_new_arm, ctx.config.snippet_cap) {
|
|
|
|
(Some(first_new_arm), Some(cap)) => {
|
|
|
|
let snippet = render_snippet(
|
|
|
|
cap,
|
|
|
|
new_arm_list.syntax(),
|
|
|
|
Cursor::Before(first_new_arm.syntax()),
|
|
|
|
);
|
|
|
|
builder.replace_snippet(cap, old_range, snippet);
|
|
|
|
}
|
|
|
|
_ => builder.replace(old_range, new_arm_list.to_string()),
|
|
|
|
}
|
2019-10-27 09:35:37 -05:00
|
|
|
})
|
2019-02-03 12:26:35 -06:00
|
|
|
}
|
|
|
|
|
2020-03-17 18:02:39 -05:00
|
|
|
fn is_variant_missing(existing_arms: &mut Vec<MatchArm>, var: &Pat) -> bool {
|
|
|
|
existing_arms.iter().filter_map(|arm| arm.pat()).all(|pat| {
|
|
|
|
// Special casee OrPat as separate top-level pats
|
|
|
|
let top_level_pats: Vec<Pat> = match pat {
|
|
|
|
Pat::OrPat(pats) => pats.pats().collect::<Vec<_>>(),
|
|
|
|
_ => vec![pat],
|
|
|
|
};
|
2020-03-17 01:30:25 -05:00
|
|
|
|
2020-03-17 18:02:39 -05:00
|
|
|
!top_level_pats.iter().any(|pat| does_pat_match_variant(pat, var))
|
|
|
|
})
|
2020-03-17 01:30:25 -05:00
|
|
|
}
|
|
|
|
|
2020-03-17 18:02:39 -05:00
|
|
|
fn does_pat_match_variant(pat: &Pat, var: &Pat) -> bool {
|
2020-06-14 16:44:28 -05:00
|
|
|
let first_node_text = |pat: &Pat| pat.syntax().first_child().map(|node| node.text());
|
|
|
|
|
|
|
|
let pat_head = match pat {
|
|
|
|
Pat::BindPat(bind_pat) => {
|
|
|
|
if let Some(p) = bind_pat.pat() {
|
|
|
|
first_node_text(&p)
|
|
|
|
} else {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
pat => first_node_text(pat),
|
|
|
|
};
|
|
|
|
|
|
|
|
let var_head = first_node_text(var);
|
2020-03-17 18:02:39 -05:00
|
|
|
|
|
|
|
pat_head == var_head
|
2019-08-22 13:31:21 -05:00
|
|
|
}
|
|
|
|
|
2020-02-18 11:35:10 -06:00
|
|
|
fn resolve_enum_def(sema: &Semantics<RootDatabase>, expr: &ast::Expr) -> Option<hir::Enum> {
|
|
|
|
sema.type_of_expr(&expr)?.autoderef(sema.db).find_map(|ty| match ty.as_adt() {
|
2020-01-10 14:42:04 -06:00
|
|
|
Some(Adt::Enum(e)) => Some(e),
|
2019-08-22 13:31:21 -05:00
|
|
|
_ => None,
|
2020-02-18 11:35:10 -06:00
|
|
|
})
|
2019-08-22 13:31:21 -05:00
|
|
|
}
|
|
|
|
|
2020-03-23 00:42:32 -05:00
|
|
|
fn resolve_tuple_of_enum_def(
|
|
|
|
sema: &Semantics<RootDatabase>,
|
|
|
|
expr: &ast::Expr,
|
|
|
|
) -> Option<Vec<hir::Enum>> {
|
2020-03-23 07:19:09 -05:00
|
|
|
sema.type_of_expr(&expr)?
|
|
|
|
.tuple_fields(sema.db)
|
|
|
|
.iter()
|
|
|
|
.map(|ty| {
|
|
|
|
ty.autoderef(sema.db).find_map(|ty| match ty.as_adt() {
|
|
|
|
Some(Adt::Enum(e)) => Some(e),
|
|
|
|
// For now we only handle expansion for a tuple of enums. Here
|
|
|
|
// we map non-enum items to None and rely on `collect` to
|
|
|
|
// convert Vec<Option<hir::Enum>> into Option<Vec<hir::Enum>>.
|
|
|
|
_ => None,
|
2020-03-23 00:42:32 -05:00
|
|
|
})
|
2020-03-23 07:19:09 -05:00
|
|
|
})
|
|
|
|
.collect()
|
2020-03-23 00:42:32 -05:00
|
|
|
}
|
|
|
|
|
2020-03-13 11:58:49 -05:00
|
|
|
fn build_pat(db: &RootDatabase, module: hir::Module, var: hir::EnumVariant) -> Option<ast::Pat> {
|
2020-03-23 06:34:56 -05:00
|
|
|
let path = crate::ast_transform::path_to_ast(module.find_use_path(db, ModuleDef::from(var))?);
|
2019-08-22 13:31:21 -05:00
|
|
|
|
2020-01-10 14:42:04 -06:00
|
|
|
// 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() {
|
2019-08-22 13:31:21 -05:00
|
|
|
ast::StructKind::Tuple(field_list) => {
|
2019-09-26 04:18:26 -05:00
|
|
|
let pats =
|
|
|
|
iter::repeat(make::placeholder_pat().into()).take(field_list.fields().count());
|
|
|
|
make::tuple_struct_pat(path, pats).into()
|
2019-08-22 13:31:21 -05:00
|
|
|
}
|
2019-11-22 12:52:06 -06:00
|
|
|
ast::StructKind::Record(field_list) => {
|
2019-09-26 04:18:26 -05:00
|
|
|
let pats = field_list.fields().map(|f| make::bind_pat(f.name().unwrap()).into());
|
|
|
|
make::record_pat(path, pats).into()
|
2019-08-22 13:31:21 -05:00
|
|
|
}
|
2020-01-10 14:42:04 -06:00
|
|
|
ast::StructKind::Unit => make::path_pat(path),
|
2019-08-22 13:31:21 -05:00
|
|
|
};
|
|
|
|
|
|
|
|
Some(pat)
|
|
|
|
}
|
|
|
|
|
2019-02-03 12:26:35 -06:00
|
|
|
#[cfg(test)]
|
|
|
|
mod tests {
|
2020-05-20 05:59:20 -05:00
|
|
|
use test_utils::mark;
|
|
|
|
|
2020-05-20 03:51:48 -05:00
|
|
|
use crate::{
|
|
|
|
tests::{check_assist, check_assist_not_applicable, check_assist_target},
|
|
|
|
utils::FamousDefs,
|
|
|
|
};
|
2019-02-03 12:26:35 -06:00
|
|
|
|
|
|
|
use super::fill_match_arms;
|
|
|
|
|
2020-03-17 01:30:25 -05:00
|
|
|
#[test]
|
2020-03-17 18:02:39 -05:00
|
|
|
fn all_match_arms_provided() {
|
|
|
|
check_assist_not_applicable(
|
2020-03-17 01:30:25 -05:00
|
|
|
fill_match_arms,
|
|
|
|
r#"
|
|
|
|
enum A {
|
|
|
|
As,
|
2020-03-17 18:02:39 -05:00
|
|
|
Bs{x:i32, y:Option<i32>},
|
|
|
|
Cs(i32, Option<i32>),
|
2020-03-17 01:30:25 -05:00
|
|
|
}
|
|
|
|
fn main() {
|
|
|
|
match A::As<|> {
|
2020-03-17 18:02:39 -05:00
|
|
|
A::As,
|
2020-03-23 21:23:30 -05:00
|
|
|
A::Bs{x,y:Some(_)} => {}
|
|
|
|
A::Cs(_, Some(_)) => {}
|
2020-03-17 01:30:25 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2020-03-23 07:19:09 -05:00
|
|
|
#[test]
|
|
|
|
fn tuple_of_non_enum() {
|
|
|
|
// for now this case is not handled, although it potentially could be
|
|
|
|
// in the future
|
|
|
|
check_assist_not_applicable(
|
|
|
|
fill_match_arms,
|
|
|
|
r#"
|
|
|
|
fn main() {
|
|
|
|
match (0, false)<|> {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2020-03-17 01:30:25 -05:00
|
|
|
#[test]
|
2020-03-17 18:02:39 -05:00
|
|
|
fn partial_fill_record_tuple() {
|
2020-03-17 01:30:25 -05:00
|
|
|
check_assist(
|
|
|
|
fill_match_arms,
|
|
|
|
r#"
|
|
|
|
enum A {
|
|
|
|
As,
|
2020-05-20 07:00:37 -05:00
|
|
|
Bs { x: i32, y: Option<i32> },
|
2020-03-17 18:02:39 -05:00
|
|
|
Cs(i32, Option<i32>),
|
2020-03-17 01:30:25 -05:00
|
|
|
}
|
|
|
|
fn main() {
|
|
|
|
match A::As<|> {
|
2020-05-20 07:00:37 -05:00
|
|
|
A::Bs { x, y: Some(_) } => {}
|
2020-03-23 21:23:30 -05:00
|
|
|
A::Cs(_, Some(_)) => {}
|
2020-03-17 01:30:25 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
r#"
|
|
|
|
enum A {
|
|
|
|
As,
|
2020-05-20 07:00:37 -05:00
|
|
|
Bs { x: i32, y: Option<i32> },
|
2020-03-17 18:02:39 -05:00
|
|
|
Cs(i32, Option<i32>),
|
2020-03-17 01:30:25 -05:00
|
|
|
}
|
|
|
|
fn main() {
|
2020-05-20 07:00:37 -05:00
|
|
|
match A::As {
|
|
|
|
A::Bs { x, y: Some(_) } => {}
|
2020-03-23 21:23:30 -05:00
|
|
|
A::Cs(_, Some(_)) => {}
|
2020-05-20 07:00:37 -05:00
|
|
|
$0A::As => {}
|
2020-03-17 01:30:25 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn partial_fill_or_pat() {
|
|
|
|
check_assist(
|
|
|
|
fill_match_arms,
|
|
|
|
r#"
|
|
|
|
enum A {
|
|
|
|
As,
|
|
|
|
Bs,
|
|
|
|
Cs(Option<i32>),
|
|
|
|
}
|
|
|
|
fn main() {
|
|
|
|
match A::As<|> {
|
2020-03-23 21:23:30 -05:00
|
|
|
A::Cs(_) | A::Bs => {}
|
2020-03-17 01:30:25 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
r#"
|
|
|
|
enum A {
|
|
|
|
As,
|
|
|
|
Bs,
|
|
|
|
Cs(Option<i32>),
|
|
|
|
}
|
|
|
|
fn main() {
|
2020-05-20 07:00:37 -05:00
|
|
|
match A::As {
|
2020-03-23 21:23:30 -05:00
|
|
|
A::Cs(_) | A::Bs => {}
|
2020-05-20 07:00:37 -05:00
|
|
|
$0A::As => {}
|
2020-03-17 01:30:25 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn partial_fill() {
|
|
|
|
check_assist(
|
|
|
|
fill_match_arms,
|
|
|
|
r#"
|
|
|
|
enum A {
|
|
|
|
As,
|
|
|
|
Bs,
|
|
|
|
Cs,
|
|
|
|
Ds(String),
|
|
|
|
Es(B),
|
|
|
|
}
|
|
|
|
enum B {
|
|
|
|
Xs,
|
|
|
|
Ys,
|
|
|
|
}
|
|
|
|
fn main() {
|
|
|
|
match A::As<|> {
|
2020-03-23 21:23:30 -05:00
|
|
|
A::Bs if 0 < 1 => {}
|
|
|
|
A::Ds(_value) => { let x = 1; }
|
2020-03-17 01:30:25 -05:00
|
|
|
A::Es(B::Xs) => (),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
r#"
|
|
|
|
enum A {
|
|
|
|
As,
|
|
|
|
Bs,
|
|
|
|
Cs,
|
|
|
|
Ds(String),
|
|
|
|
Es(B),
|
|
|
|
}
|
|
|
|
enum B {
|
|
|
|
Xs,
|
|
|
|
Ys,
|
|
|
|
}
|
|
|
|
fn main() {
|
2020-05-20 07:00:37 -05:00
|
|
|
match A::As {
|
2020-03-23 21:23:30 -05:00
|
|
|
A::Bs if 0 < 1 => {}
|
|
|
|
A::Ds(_value) => { let x = 1; }
|
2020-03-17 01:30:25 -05:00
|
|
|
A::Es(B::Xs) => (),
|
2020-05-20 07:00:37 -05:00
|
|
|
$0A::As => {}
|
2020-03-23 21:23:30 -05:00
|
|
|
A::Cs => {}
|
2020-03-17 01:30:25 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2020-06-14 16:43:16 -05:00
|
|
|
#[test]
|
|
|
|
fn partial_fill_bind_pat() {
|
|
|
|
check_assist(
|
|
|
|
fill_match_arms,
|
|
|
|
r#"
|
|
|
|
enum A {
|
|
|
|
As,
|
|
|
|
Bs,
|
|
|
|
Cs(Option<i32>),
|
|
|
|
}
|
|
|
|
fn main() {
|
|
|
|
match A::As<|> {
|
|
|
|
A::As(_) => {}
|
|
|
|
a @ A::Bs(_) => {}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
r#"
|
|
|
|
enum A {
|
|
|
|
As,
|
|
|
|
Bs,
|
|
|
|
Cs(Option<i32>),
|
|
|
|
}
|
|
|
|
fn main() {
|
|
|
|
match A::As {
|
|
|
|
A::As(_) => {}
|
|
|
|
a @ A::Bs(_) => {}
|
|
|
|
$0A::Cs(_) => {}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2019-02-03 12:26:35 -06:00
|
|
|
#[test]
|
|
|
|
fn fill_match_arms_empty_body() {
|
|
|
|
check_assist(
|
|
|
|
fill_match_arms,
|
|
|
|
r#"
|
|
|
|
enum A {
|
|
|
|
As,
|
|
|
|
Bs,
|
|
|
|
Cs(String),
|
|
|
|
Ds(String, String),
|
2020-05-20 07:00:37 -05:00
|
|
|
Es { x: usize, y: usize }
|
2019-02-03 12:26:35 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
fn main() {
|
|
|
|
let a = A::As;
|
|
|
|
match a<|> {}
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
r#"
|
|
|
|
enum A {
|
|
|
|
As,
|
|
|
|
Bs,
|
|
|
|
Cs(String),
|
|
|
|
Ds(String, String),
|
2020-05-20 07:00:37 -05:00
|
|
|
Es { x: usize, y: usize }
|
2019-02-03 12:26:35 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
fn main() {
|
|
|
|
let a = A::As;
|
2020-05-20 07:00:37 -05:00
|
|
|
match a {
|
|
|
|
$0A::As => {}
|
2020-03-23 21:23:30 -05:00
|
|
|
A::Bs => {}
|
|
|
|
A::Cs(_) => {}
|
|
|
|
A::Ds(_, _) => {}
|
|
|
|
A::Es { x, y } => {}
|
2019-02-03 12:26:35 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
);
|
|
|
|
}
|
2019-02-23 06:59:41 -06:00
|
|
|
|
2020-03-23 00:42:32 -05:00
|
|
|
#[test]
|
|
|
|
fn fill_match_arms_tuple_of_enum() {
|
|
|
|
check_assist(
|
|
|
|
fill_match_arms,
|
|
|
|
r#"
|
2020-05-20 07:00:37 -05:00
|
|
|
enum A { One, Two }
|
|
|
|
enum B { One, Two }
|
2020-03-23 00:42:32 -05:00
|
|
|
|
|
|
|
fn main() {
|
|
|
|
let a = A::One;
|
|
|
|
let b = B::One;
|
|
|
|
match (a<|>, b) {}
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
r#"
|
2020-05-20 07:00:37 -05:00
|
|
|
enum A { One, Two }
|
|
|
|
enum B { One, Two }
|
2020-03-23 00:42:32 -05:00
|
|
|
|
|
|
|
fn main() {
|
|
|
|
let a = A::One;
|
|
|
|
let b = B::One;
|
2020-05-20 07:00:37 -05:00
|
|
|
match (a, b) {
|
|
|
|
$0(A::One, B::One) => {}
|
2020-03-23 21:23:30 -05:00
|
|
|
(A::One, B::Two) => {}
|
|
|
|
(A::Two, B::One) => {}
|
|
|
|
(A::Two, B::Two) => {}
|
2020-03-23 00:42:32 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2020-03-23 07:19:09 -05:00
|
|
|
#[test]
|
|
|
|
fn fill_match_arms_tuple_of_enum_ref() {
|
|
|
|
check_assist(
|
|
|
|
fill_match_arms,
|
|
|
|
r#"
|
2020-05-20 07:00:37 -05:00
|
|
|
enum A { One, Two }
|
|
|
|
enum B { One, Two }
|
2020-03-23 07:19:09 -05:00
|
|
|
|
|
|
|
fn main() {
|
|
|
|
let a = A::One;
|
|
|
|
let b = B::One;
|
|
|
|
match (&a<|>, &b) {}
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
r#"
|
2020-05-20 07:00:37 -05:00
|
|
|
enum A { One, Two }
|
|
|
|
enum B { One, Two }
|
2020-03-23 07:19:09 -05:00
|
|
|
|
|
|
|
fn main() {
|
|
|
|
let a = A::One;
|
|
|
|
let b = B::One;
|
2020-05-20 07:00:37 -05:00
|
|
|
match (&a, &b) {
|
|
|
|
$0(A::One, B::One) => {}
|
2020-03-23 21:23:30 -05:00
|
|
|
(A::One, B::Two) => {}
|
|
|
|
(A::Two, B::One) => {}
|
|
|
|
(A::Two, B::Two) => {}
|
2020-03-23 07:19:09 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2020-03-23 00:42:32 -05:00
|
|
|
#[test]
|
|
|
|
fn fill_match_arms_tuple_of_enum_partial() {
|
|
|
|
check_assist_not_applicable(
|
|
|
|
fill_match_arms,
|
|
|
|
r#"
|
2020-05-20 07:00:37 -05:00
|
|
|
enum A { One, Two }
|
|
|
|
enum B { One, Two }
|
2020-03-23 00:42:32 -05:00
|
|
|
|
|
|
|
fn main() {
|
|
|
|
let a = A::One;
|
|
|
|
let b = B::One;
|
|
|
|
match (a<|>, b) {
|
2020-03-23 21:23:30 -05:00
|
|
|
(A::Two, B::One) => {}
|
2020-03-23 00:42:32 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn fill_match_arms_tuple_of_enum_not_applicable() {
|
|
|
|
check_assist_not_applicable(
|
|
|
|
fill_match_arms,
|
|
|
|
r#"
|
2020-05-20 07:00:37 -05:00
|
|
|
enum A { One, Two }
|
|
|
|
enum B { One, Two }
|
2020-03-23 00:42:32 -05:00
|
|
|
|
|
|
|
fn main() {
|
|
|
|
let a = A::One;
|
|
|
|
let b = B::One;
|
|
|
|
match (a<|>, b) {
|
2020-03-23 21:23:30 -05:00
|
|
|
(A::Two, B::One) => {}
|
|
|
|
(A::One, B::One) => {}
|
|
|
|
(A::One, B::Two) => {}
|
|
|
|
(A::Two, B::Two) => {}
|
2020-03-23 00:42:32 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2020-03-23 07:19:09 -05:00
|
|
|
#[test]
|
|
|
|
fn fill_match_arms_single_element_tuple_of_enum() {
|
|
|
|
// For now we don't hande the case of a single element tuple, but
|
|
|
|
// we could handle this in the future if `make::tuple_pat` allowed
|
|
|
|
// creating a tuple with a single pattern.
|
|
|
|
check_assist_not_applicable(
|
|
|
|
fill_match_arms,
|
|
|
|
r#"
|
2020-05-20 07:00:37 -05:00
|
|
|
enum A { One, Two }
|
2020-03-23 07:19:09 -05:00
|
|
|
|
|
|
|
fn main() {
|
|
|
|
let a = A::One;
|
|
|
|
match (a<|>, ) {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2019-02-23 06:59:41 -06:00
|
|
|
#[test]
|
|
|
|
fn test_fill_match_arm_refs() {
|
|
|
|
check_assist(
|
|
|
|
fill_match_arms,
|
|
|
|
r#"
|
2020-05-20 07:00:37 -05:00
|
|
|
enum A { As }
|
2019-02-23 06:59:41 -06:00
|
|
|
|
|
|
|
fn foo(a: &A) {
|
|
|
|
match a<|> {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
r#"
|
2020-05-20 07:00:37 -05:00
|
|
|
enum A { As }
|
2019-02-23 06:59:41 -06:00
|
|
|
|
|
|
|
fn foo(a: &A) {
|
2020-05-20 07:00:37 -05:00
|
|
|
match a {
|
|
|
|
$0A::As => {}
|
2019-02-23 06:59:41 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
);
|
|
|
|
|
|
|
|
check_assist(
|
|
|
|
fill_match_arms,
|
|
|
|
r#"
|
|
|
|
enum A {
|
2020-05-20 07:00:37 -05:00
|
|
|
Es { x: usize, y: usize }
|
2019-02-23 06:59:41 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
fn foo(a: &mut A) {
|
|
|
|
match a<|> {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
r#"
|
|
|
|
enum A {
|
2020-05-20 07:00:37 -05:00
|
|
|
Es { x: usize, y: usize }
|
2019-02-23 06:59:41 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
fn foo(a: &mut A) {
|
2020-05-20 07:00:37 -05:00
|
|
|
match a {
|
|
|
|
$0A::Es { x, y } => {}
|
2019-02-03 12:26:35 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
);
|
|
|
|
}
|
2019-02-08 17:34:05 -06:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn fill_match_arms_target() {
|
|
|
|
check_assist_target(
|
|
|
|
fill_match_arms,
|
|
|
|
r#"
|
2019-08-22 13:31:21 -05:00
|
|
|
enum E { X, Y }
|
2019-02-08 17:34:05 -06:00
|
|
|
|
|
|
|
fn main() {
|
|
|
|
match E::X<|> {}
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
"match E::X {}",
|
|
|
|
);
|
|
|
|
}
|
2019-06-23 23:05:50 -05:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn fill_match_arms_trivial_arm() {
|
|
|
|
check_assist(
|
|
|
|
fill_match_arms,
|
|
|
|
r#"
|
|
|
|
enum E { X, Y }
|
|
|
|
|
|
|
|
fn main() {
|
|
|
|
match E::X {
|
2020-03-23 21:23:30 -05:00
|
|
|
<|>_ => {}
|
2019-06-23 23:05:50 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
r#"
|
|
|
|
enum E { X, Y }
|
|
|
|
|
|
|
|
fn main() {
|
2020-05-20 07:00:37 -05:00
|
|
|
match E::X {
|
|
|
|
$0E::X => {}
|
2020-03-23 21:23:30 -05:00
|
|
|
E::Y => {}
|
2019-06-23 23:05:50 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
);
|
|
|
|
}
|
2020-01-10 14:42:04 -06:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn fill_match_arms_qualifies_path() {
|
|
|
|
check_assist(
|
|
|
|
fill_match_arms,
|
|
|
|
r#"
|
|
|
|
mod foo { pub enum E { X, Y } }
|
|
|
|
use foo::E::X;
|
|
|
|
|
|
|
|
fn main() {
|
|
|
|
match X {
|
|
|
|
<|>
|
|
|
|
}
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
r#"
|
|
|
|
mod foo { pub enum E { X, Y } }
|
|
|
|
use foo::E::X;
|
|
|
|
|
|
|
|
fn main() {
|
2020-05-20 07:00:37 -05:00
|
|
|
match X {
|
|
|
|
$0X => {}
|
2020-03-23 21:23:30 -05:00
|
|
|
foo::E::Y => {}
|
2020-01-10 14:42:04 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
);
|
|
|
|
}
|
2020-03-28 15:44:12 -05:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn fill_match_arms_preserves_comments() {
|
|
|
|
check_assist(
|
|
|
|
fill_match_arms,
|
|
|
|
r#"
|
2020-05-20 07:00:37 -05:00
|
|
|
enum A { One, Two }
|
2020-03-28 15:44:12 -05:00
|
|
|
fn foo(a: A) {
|
|
|
|
match a {
|
2020-03-28 16:24:26 -05:00
|
|
|
// foo bar baz<|>
|
2020-03-28 15:44:12 -05:00
|
|
|
A::One => {}
|
|
|
|
// This is where the rest should be
|
|
|
|
}
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
r#"
|
2020-05-20 07:00:37 -05:00
|
|
|
enum A { One, Two }
|
2020-03-28 15:44:12 -05:00
|
|
|
fn foo(a: A) {
|
2020-05-20 07:00:37 -05:00
|
|
|
match a {
|
2020-03-28 16:24:26 -05:00
|
|
|
// foo bar baz
|
2020-03-28 15:44:12 -05:00
|
|
|
A::One => {}
|
|
|
|
// This is where the rest should be
|
2020-05-20 07:00:37 -05:00
|
|
|
$0A::Two => {}
|
2020-03-28 15:44:12 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn fill_match_arms_preserves_comments_empty() {
|
|
|
|
check_assist(
|
|
|
|
fill_match_arms,
|
|
|
|
r#"
|
2020-05-20 07:00:37 -05:00
|
|
|
enum A { One, Two }
|
2020-03-28 15:44:12 -05:00
|
|
|
fn foo(a: A) {
|
|
|
|
match a {
|
2020-03-28 16:24:26 -05:00
|
|
|
// foo bar baz<|>
|
2020-03-28 15:44:12 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
r#"
|
2020-05-20 07:00:37 -05:00
|
|
|
enum A { One, Two }
|
2020-03-28 15:44:12 -05:00
|
|
|
fn foo(a: A) {
|
2020-05-20 07:00:37 -05:00
|
|
|
match a {
|
2020-03-28 16:24:26 -05:00
|
|
|
// foo bar baz
|
2020-05-20 07:00:37 -05:00
|
|
|
$0A::One => {}
|
2020-03-28 15:44:12 -05:00
|
|
|
A::Two => {}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
);
|
|
|
|
}
|
2020-03-31 07:52:20 -05:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn fill_match_arms_placeholder() {
|
|
|
|
check_assist(
|
|
|
|
fill_match_arms,
|
|
|
|
r#"
|
|
|
|
enum A { One, Two, }
|
|
|
|
fn foo(a: A) {
|
|
|
|
match a<|> {
|
|
|
|
_ => (),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
r#"
|
|
|
|
enum A { One, Two, }
|
|
|
|
fn foo(a: A) {
|
2020-05-20 07:00:37 -05:00
|
|
|
match a {
|
|
|
|
$0A::One => {}
|
2020-03-31 07:52:20 -05:00
|
|
|
A::Two => {}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
);
|
|
|
|
}
|
2020-05-20 03:51:48 -05:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn option_order() {
|
2020-05-20 05:59:20 -05:00
|
|
|
mark::check!(option_order);
|
2020-05-20 03:51:48 -05:00
|
|
|
let before = r#"
|
|
|
|
fn foo(opt: Option<i32>) {
|
|
|
|
match opt<|> {
|
|
|
|
}
|
2020-06-23 17:30:34 -05:00
|
|
|
}
|
|
|
|
"#;
|
|
|
|
let before = &format!("//- /main.rs crate:main deps:core{}{}", before, FamousDefs::FIXTURE);
|
2020-05-20 03:51:48 -05:00
|
|
|
|
|
|
|
check_assist(
|
|
|
|
fill_match_arms,
|
|
|
|
before,
|
|
|
|
r#"
|
|
|
|
fn foo(opt: Option<i32>) {
|
2020-05-20 07:00:37 -05:00
|
|
|
match opt {
|
|
|
|
$0Some(_) => {}
|
2020-05-20 03:51:48 -05:00
|
|
|
None => {}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
);
|
|
|
|
}
|
2019-02-03 12:26:35 -06:00
|
|
|
}
|