2019-09-30 03:58:53 -05:00
|
|
|
//! FIXME: write short doc here
|
|
|
|
|
2020-03-17 01:30:25 -05:00
|
|
|
use std::{collections::LinkedList, iter};
|
2019-02-03 12:26:35 -06:00
|
|
|
|
2020-03-13 11:58:49 -05:00
|
|
|
use hir::{Adt, HasSource, Semantics};
|
2020-03-19 06:36:33 -05:00
|
|
|
use ra_ide_db::RootDatabase;
|
2019-02-03 12:26:35 -06:00
|
|
|
|
2019-09-26 04:18:26 -05:00
|
|
|
use crate::{Assist, AssistCtx, AssistId};
|
2020-03-17 01:30:25 -05:00
|
|
|
use ra_syntax::{
|
|
|
|
ast::{self, edit::IndentLevel, make, AstNode, NameOwner},
|
|
|
|
SyntaxKind, SyntaxNode,
|
|
|
|
};
|
|
|
|
|
|
|
|
use ast::{MatchArm, MatchGuard, Pat};
|
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 {
|
2019-10-26 10:03:55 -05:00
|
|
|
// Action::Move { distance } => (),
|
2019-10-26 09:37:04 -05:00
|
|
|
// Action::Stop => (),
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
// ```
|
2020-02-06 09:58:57 -06:00
|
|
|
pub(crate) fn fill_match_arms(ctx: AssistCtx) -> Option<Assist> {
|
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-02-18 11:35:10 -06:00
|
|
|
let enum_def = resolve_enum_def(&ctx.sema, &expr)?;
|
|
|
|
let module = ctx.sema.scope(expr.syntax()).module()?;
|
|
|
|
|
2020-01-10 14:42:04 -06:00
|
|
|
let variants = enum_def.variants(ctx.db);
|
|
|
|
if variants.is_empty() {
|
|
|
|
return None;
|
|
|
|
}
|
|
|
|
|
|
|
|
let db = ctx.db;
|
2020-01-14 11:32:26 -06:00
|
|
|
ctx.add_assist(AssistId("fill_match_arms"), "Fill match arms", |edit| {
|
2020-03-17 01:30:25 -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();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
let mut has_partial_match = false;
|
|
|
|
let variants: Vec<MatchArm> = variants
|
|
|
|
.into_iter()
|
|
|
|
.filter_map(|variant| build_pat(db, module, variant))
|
|
|
|
.filter(|variant_pat| {
|
|
|
|
!arms.iter().filter_map(|arm| arm.pat().map(|_| arm)).any(|arm| {
|
|
|
|
let pat = arm.pat().unwrap();
|
|
|
|
|
|
|
|
// Special casee OrPat as separate top-level pats
|
|
|
|
let pats: Vec<Pat> = match Pat::from(pat.clone()) {
|
|
|
|
Pat::OrPat(pats) => pats.pats().collect::<Vec<_>>(),
|
|
|
|
_ => vec![pat],
|
|
|
|
};
|
2019-10-12 14:07:47 -05:00
|
|
|
|
2020-03-17 01:30:25 -05:00
|
|
|
pats.iter().any(|pat| {
|
|
|
|
match does_arm_pat_match_variant(pat, arm.guard(), variant_pat) {
|
|
|
|
ArmMatch::Yes => true,
|
|
|
|
ArmMatch::No => false,
|
|
|
|
ArmMatch::Partial => {
|
|
|
|
has_partial_match = true;
|
|
|
|
true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
})
|
|
|
|
})
|
|
|
|
})
|
|
|
|
.map(|pat| make::match_arm(iter::once(pat), make::expr_unit()))
|
|
|
|
.collect();
|
|
|
|
|
|
|
|
arms.extend(variants);
|
|
|
|
if has_partial_match {
|
|
|
|
arms.push(make::match_arm(
|
|
|
|
iter::once(make::placeholder_pat().into()),
|
|
|
|
make::expr_unit(),
|
|
|
|
));
|
|
|
|
}
|
|
|
|
|
|
|
|
let indent_level = IndentLevel::from_node(match_arm_list.syntax());
|
|
|
|
let new_arm_list = indent_level.increase_indent(make::match_arm_list(arms));
|
2019-02-03 12:26:35 -06:00
|
|
|
|
2019-07-20 04:58:27 -05:00
|
|
|
edit.target(match_expr.syntax().text_range());
|
|
|
|
edit.set_cursor(expr.syntax().text_range().start());
|
2019-10-12 14:07:47 -05:00
|
|
|
edit.replace_ast(match_arm_list, new_arm_list);
|
2019-10-27 09:35:37 -05:00
|
|
|
})
|
2019-02-03 12:26:35 -06:00
|
|
|
}
|
|
|
|
|
2020-03-17 01:30:25 -05:00
|
|
|
enum ArmMatch {
|
|
|
|
Yes,
|
|
|
|
No,
|
|
|
|
Partial,
|
|
|
|
}
|
|
|
|
|
|
|
|
fn does_arm_pat_match_variant(arm: &Pat, arm_guard: Option<MatchGuard>, var: &Pat) -> ArmMatch {
|
|
|
|
let arm = flatten_pats(arm.clone());
|
|
|
|
let var = flatten_pats(var.clone());
|
|
|
|
let mut arm = arm.iter();
|
|
|
|
let mut var = var.iter();
|
|
|
|
|
|
|
|
// If the first part of the Pat don't match, there's no match
|
|
|
|
match (arm.next(), var.next()) {
|
|
|
|
(Some(arm), Some(var)) if arm.text() == var.text() => {}
|
|
|
|
_ => return ArmMatch::No,
|
|
|
|
}
|
|
|
|
|
|
|
|
// If we have a guard we automatically know we have a partial match
|
|
|
|
if arm_guard.is_some() {
|
|
|
|
return ArmMatch::Partial;
|
2020-02-09 12:57:01 -06:00
|
|
|
}
|
2020-03-17 01:30:25 -05:00
|
|
|
|
|
|
|
if arm.clone().count() != var.clone().count() {
|
|
|
|
return ArmMatch::Partial;
|
|
|
|
}
|
|
|
|
|
|
|
|
let direct_match = arm.zip(var).all(|(arm, var)| {
|
|
|
|
if arm.text() == var.text() {
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
match (arm.kind(), var.kind()) {
|
|
|
|
(SyntaxKind::PLACEHOLDER_PAT, SyntaxKind::PLACEHOLDER_PAT) => true,
|
|
|
|
(SyntaxKind::DOT_DOT_PAT, SyntaxKind::PLACEHOLDER_PAT) => true,
|
|
|
|
(SyntaxKind::BIND_PAT, SyntaxKind::PLACEHOLDER_PAT) => true,
|
|
|
|
_ => false,
|
|
|
|
}
|
|
|
|
});
|
|
|
|
|
|
|
|
match direct_match {
|
|
|
|
true => ArmMatch::Yes,
|
|
|
|
false => ArmMatch::Partial,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn flatten_pats(pat: Pat) -> Vec<SyntaxNode> {
|
|
|
|
let mut pats: LinkedList<SyntaxNode> = pat.syntax().children().collect();
|
|
|
|
let mut out: Vec<SyntaxNode> = vec![];
|
|
|
|
while let Some(p) = pats.pop_front() {
|
|
|
|
pats.extend(p.children());
|
|
|
|
out.push(p);
|
|
|
|
}
|
|
|
|
out
|
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-13 11:58:49 -05:00
|
|
|
fn build_pat(db: &RootDatabase, module: hir::Module, var: hir::EnumVariant) -> Option<ast::Pat> {
|
2020-01-10 14:42:04 -06:00
|
|
|
let path = crate::ast_transform::path_to_ast(module.find_use_path(db, var.into())?);
|
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 {
|
2019-02-08 17:34:05 -06:00
|
|
|
use crate::helpers::{check_assist, check_assist_target};
|
2019-02-03 12:26:35 -06:00
|
|
|
|
|
|
|
use super::fill_match_arms;
|
|
|
|
|
2020-03-17 01:30:25 -05:00
|
|
|
#[test]
|
|
|
|
fn partial_fill_multi() {
|
|
|
|
check_assist(
|
|
|
|
fill_match_arms,
|
|
|
|
r#"
|
|
|
|
enum A {
|
|
|
|
As,
|
|
|
|
Bs(i32, Option<i32>)
|
|
|
|
}
|
|
|
|
fn main() {
|
|
|
|
match A::As<|> {
|
|
|
|
A::Bs(_, Some(_)) => (),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
r#"
|
|
|
|
enum A {
|
|
|
|
As,
|
|
|
|
Bs(i32, Option<i32>)
|
|
|
|
}
|
|
|
|
fn main() {
|
|
|
|
match <|>A::As {
|
|
|
|
A::Bs(_, Some(_)) => (),
|
|
|
|
A::As => (),
|
|
|
|
_ => (),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn partial_fill_record() {
|
|
|
|
check_assist(
|
|
|
|
fill_match_arms,
|
|
|
|
r#"
|
|
|
|
enum A {
|
|
|
|
As,
|
|
|
|
Bs{x:i32, y:Option<i32>},
|
|
|
|
}
|
|
|
|
fn main() {
|
|
|
|
match A::As<|> {
|
|
|
|
A::Bs{x,y:Some(_)} => (),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
r#"
|
|
|
|
enum A {
|
|
|
|
As,
|
|
|
|
Bs{x:i32, y:Option<i32>},
|
|
|
|
}
|
|
|
|
fn main() {
|
|
|
|
match <|>A::As {
|
|
|
|
A::Bs{x,y:Some(_)} => (),
|
|
|
|
A::As => (),
|
|
|
|
_ => (),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn partial_fill_or_pat() {
|
|
|
|
check_assist(
|
|
|
|
fill_match_arms,
|
|
|
|
r#"
|
|
|
|
enum A {
|
|
|
|
As,
|
|
|
|
Bs,
|
|
|
|
Cs(Option<i32>),
|
|
|
|
}
|
|
|
|
fn main() {
|
|
|
|
match A::As<|> {
|
|
|
|
A::Cs(_) | A::Bs => (),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
r#"
|
|
|
|
enum A {
|
|
|
|
As,
|
|
|
|
Bs,
|
|
|
|
Cs(Option<i32>),
|
|
|
|
}
|
|
|
|
fn main() {
|
|
|
|
match <|>A::As {
|
|
|
|
A::Cs(_) | A::Bs => (),
|
|
|
|
A::As => (),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn partial_fill_or_pat2() {
|
|
|
|
check_assist(
|
|
|
|
fill_match_arms,
|
|
|
|
r#"
|
|
|
|
enum A {
|
|
|
|
As,
|
|
|
|
Bs,
|
|
|
|
Cs(Option<i32>),
|
|
|
|
}
|
|
|
|
fn main() {
|
|
|
|
match A::As<|> {
|
|
|
|
A::Cs(Some(_)) | A::Bs => (),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
r#"
|
|
|
|
enum A {
|
|
|
|
As,
|
|
|
|
Bs,
|
|
|
|
Cs(Option<i32>),
|
|
|
|
}
|
|
|
|
fn main() {
|
|
|
|
match <|>A::As {
|
|
|
|
A::Cs(Some(_)) | A::Bs => (),
|
|
|
|
A::As => (),
|
|
|
|
_ => (),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[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<|> {
|
|
|
|
A::Bs if 0 < 1 => (),
|
|
|
|
A::Ds(_value) => (),
|
|
|
|
A::Es(B::Xs) => (),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
r#"
|
|
|
|
enum A {
|
|
|
|
As,
|
|
|
|
Bs,
|
|
|
|
Cs,
|
|
|
|
Ds(String),
|
|
|
|
Es(B),
|
|
|
|
}
|
|
|
|
enum B {
|
|
|
|
Xs,
|
|
|
|
Ys,
|
|
|
|
}
|
|
|
|
fn main() {
|
|
|
|
match <|>A::As {
|
|
|
|
A::Bs if 0 < 1 => (),
|
|
|
|
A::Ds(_value) => (),
|
|
|
|
A::Es(B::Xs) => (),
|
|
|
|
A::As => (),
|
|
|
|
A::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),
|
2019-08-22 13:31:21 -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),
|
2019-08-22 13:31:21 -05:00
|
|
|
Es{ x: usize, y: usize }
|
2019-02-03 12:26:35 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
fn main() {
|
|
|
|
let a = A::As;
|
|
|
|
match <|>a {
|
|
|
|
A::As => (),
|
|
|
|
A::Bs => (),
|
|
|
|
A::Cs(_) => (),
|
|
|
|
A::Ds(_, _) => (),
|
2019-10-26 10:03:55 -05:00
|
|
|
A::Es { x, y } => (),
|
2019-02-03 12:26:35 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
);
|
|
|
|
}
|
2019-02-23 06:59:41 -06:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_fill_match_arm_refs() {
|
|
|
|
check_assist(
|
|
|
|
fill_match_arms,
|
|
|
|
r#"
|
|
|
|
enum A {
|
|
|
|
As,
|
|
|
|
}
|
|
|
|
|
|
|
|
fn foo(a: &A) {
|
|
|
|
match a<|> {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
r#"
|
|
|
|
enum A {
|
|
|
|
As,
|
|
|
|
}
|
|
|
|
|
|
|
|
fn foo(a: &A) {
|
|
|
|
match <|>a {
|
|
|
|
A::As => (),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
);
|
|
|
|
|
|
|
|
check_assist(
|
|
|
|
fill_match_arms,
|
|
|
|
r#"
|
|
|
|
enum A {
|
2019-08-22 13:31:21 -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 {
|
2019-08-22 13:31:21 -05:00
|
|
|
Es{ x: usize, y: usize }
|
2019-02-23 06:59:41 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
fn foo(a: &mut A) {
|
|
|
|
match <|>a {
|
2019-10-26 10:03:55 -05:00
|
|
|
A::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 {
|
|
|
|
<|>_ => {},
|
|
|
|
}
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
r#"
|
|
|
|
enum E { X, Y }
|
|
|
|
|
|
|
|
fn main() {
|
|
|
|
match <|>E::X {
|
|
|
|
E::X => (),
|
|
|
|
E::Y => (),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
);
|
|
|
|
}
|
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() {
|
|
|
|
match <|>X {
|
|
|
|
X => (),
|
|
|
|
foo::E::Y => (),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
);
|
|
|
|
}
|
2019-02-03 12:26:35 -06:00
|
|
|
}
|