2022-05-05 12:14:11 -05:00
|
|
|
use hir::Semantics;
|
|
|
|
use ide_db::RootDatabase;
|
|
|
|
use syntax::ast::{edit::AstNodeEdit, AstNode, HasName, LetStmt, Name, Pat};
|
2022-05-02 16:45:31 -05:00
|
|
|
use syntax::T;
|
2022-04-30 22:19:12 -05:00
|
|
|
|
|
|
|
use crate::{AssistContext, AssistId, AssistKind, Assists};
|
|
|
|
|
|
|
|
/// Gets a list of binders in a pattern, and whether they are mut.
|
2022-05-05 12:14:11 -05:00
|
|
|
fn binders_in_pat(
|
|
|
|
acc: &mut Vec<(Name, bool)>,
|
|
|
|
pat: &Pat,
|
2022-07-20 08:02:08 -05:00
|
|
|
sem: &Semantics<'_, RootDatabase>,
|
2022-05-05 12:14:11 -05:00
|
|
|
) -> Option<()> {
|
2022-04-30 22:19:12 -05:00
|
|
|
use Pat::*;
|
|
|
|
match pat {
|
|
|
|
IdentPat(p) => {
|
2022-05-05 12:14:11 -05:00
|
|
|
let ident = p.name()?;
|
2022-04-30 22:19:12 -05:00
|
|
|
let ismut = p.ref_token().is_none() && p.mut_token().is_some();
|
2022-05-05 12:57:47 -05:00
|
|
|
// check for const reference
|
2022-05-17 13:38:50 -05:00
|
|
|
if sem.resolve_bind_pat_to_const(p).is_none() {
|
2022-05-05 12:57:47 -05:00
|
|
|
acc.push((ident, ismut));
|
|
|
|
}
|
2022-04-30 22:19:12 -05:00
|
|
|
if let Some(inner) = p.pat() {
|
2022-05-05 12:14:11 -05:00
|
|
|
binders_in_pat(acc, &inner, sem)?;
|
2022-04-30 22:19:12 -05:00
|
|
|
}
|
2022-05-05 12:14:11 -05:00
|
|
|
Some(())
|
2022-04-30 22:19:12 -05:00
|
|
|
}
|
2022-05-05 12:14:11 -05:00
|
|
|
BoxPat(p) => p.pat().and_then(|p| binders_in_pat(acc, &p, sem)),
|
|
|
|
RestPat(_) | LiteralPat(_) | PathPat(_) | WildcardPat(_) | ConstBlockPat(_) => Some(()),
|
2022-04-30 22:19:12 -05:00
|
|
|
OrPat(p) => {
|
|
|
|
for p in p.pats() {
|
2022-05-05 12:14:11 -05:00
|
|
|
binders_in_pat(acc, &p, sem)?;
|
2022-04-30 22:19:12 -05:00
|
|
|
}
|
2022-05-05 12:14:11 -05:00
|
|
|
Some(())
|
2022-04-30 22:19:12 -05:00
|
|
|
}
|
2022-05-05 12:14:11 -05:00
|
|
|
ParenPat(p) => p.pat().and_then(|p| binders_in_pat(acc, &p, sem)),
|
2022-04-30 22:19:12 -05:00
|
|
|
RangePat(p) => {
|
2022-05-05 12:14:11 -05:00
|
|
|
if let Some(st) = p.start() {
|
|
|
|
binders_in_pat(acc, &st, sem)?
|
|
|
|
}
|
|
|
|
if let Some(ed) = p.end() {
|
|
|
|
binders_in_pat(acc, &ed, sem)?
|
|
|
|
}
|
|
|
|
Some(())
|
2022-04-30 22:19:12 -05:00
|
|
|
}
|
|
|
|
RecordPat(p) => {
|
|
|
|
for f in p.record_pat_field_list()?.fields() {
|
|
|
|
let pat = f.pat()?;
|
2022-05-05 12:14:11 -05:00
|
|
|
binders_in_pat(acc, &pat, sem)?;
|
2022-04-30 22:19:12 -05:00
|
|
|
}
|
2022-05-05 12:14:11 -05:00
|
|
|
Some(())
|
2022-04-30 22:19:12 -05:00
|
|
|
}
|
2022-05-05 12:14:11 -05:00
|
|
|
RefPat(p) => p.pat().and_then(|p| binders_in_pat(acc, &p, sem)),
|
2022-04-30 22:19:12 -05:00
|
|
|
SlicePat(p) => {
|
|
|
|
for p in p.pats() {
|
2022-05-05 12:14:11 -05:00
|
|
|
binders_in_pat(acc, &p, sem)?;
|
2022-04-30 22:19:12 -05:00
|
|
|
}
|
2022-05-05 12:14:11 -05:00
|
|
|
Some(())
|
2022-04-30 22:19:12 -05:00
|
|
|
}
|
|
|
|
TuplePat(p) => {
|
|
|
|
for p in p.fields() {
|
2022-05-05 12:14:11 -05:00
|
|
|
binders_in_pat(acc, &p, sem)?;
|
2022-04-30 22:19:12 -05:00
|
|
|
}
|
2022-05-05 12:14:11 -05:00
|
|
|
Some(())
|
2022-04-30 22:19:12 -05:00
|
|
|
}
|
|
|
|
TupleStructPat(p) => {
|
|
|
|
for p in p.fields() {
|
2022-05-05 12:14:11 -05:00
|
|
|
binders_in_pat(acc, &p, sem)?;
|
2022-04-30 22:19:12 -05:00
|
|
|
}
|
2022-05-05 12:14:11 -05:00
|
|
|
Some(())
|
2022-04-30 22:19:12 -05:00
|
|
|
}
|
|
|
|
// don't support macro pat yet
|
|
|
|
MacroPat(_) => None,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-05-05 12:14:11 -05:00
|
|
|
fn binders_to_str(binders: &[(Name, bool)], addmut: bool) -> String {
|
2022-04-30 22:19:12 -05:00
|
|
|
let vars = binders
|
|
|
|
.iter()
|
|
|
|
.map(
|
|
|
|
|(ident, ismut)| {
|
|
|
|
if *ismut && addmut {
|
|
|
|
format!("mut {}", ident)
|
|
|
|
} else {
|
|
|
|
ident.to_string()
|
|
|
|
}
|
|
|
|
},
|
|
|
|
)
|
|
|
|
.collect::<Vec<_>>()
|
|
|
|
.join(", ");
|
|
|
|
if binders.is_empty() {
|
|
|
|
String::from("{}")
|
|
|
|
} else if binders.len() == 1 {
|
|
|
|
vars
|
|
|
|
} else {
|
|
|
|
format!("({})", vars)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Assist: convert_let_else_to_match
|
|
|
|
//
|
|
|
|
// Converts let-else statement to let statement and match expression.
|
|
|
|
//
|
|
|
|
// ```
|
|
|
|
// fn main() {
|
2022-05-02 16:45:31 -05:00
|
|
|
// let Ok(mut x) = f() else$0 { return };
|
2022-04-30 22:19:12 -05:00
|
|
|
// }
|
|
|
|
// ```
|
|
|
|
// ->
|
|
|
|
// ```
|
|
|
|
// fn main() {
|
|
|
|
// let mut x = match f() {
|
|
|
|
// Ok(x) => x,
|
|
|
|
// _ => return,
|
|
|
|
// };
|
|
|
|
// }
|
|
|
|
// ```
|
2022-07-20 08:02:08 -05:00
|
|
|
pub(crate) fn convert_let_else_to_match(acc: &mut Assists, ctx: &AssistContext<'_>) -> Option<()> {
|
2022-05-02 16:45:31 -05:00
|
|
|
// should focus on else token to trigger
|
|
|
|
let else_token = ctx.find_token_syntax_at_offset(T![else])?;
|
|
|
|
let let_stmt = LetStmt::cast(else_token.parent()?.parent()?)?;
|
2022-04-30 22:19:12 -05:00
|
|
|
let let_else_block = let_stmt.let_else()?.block_expr()?;
|
|
|
|
let let_init = let_stmt.initializer()?;
|
|
|
|
if let_stmt.ty().is_some() {
|
|
|
|
// don't support let with type annotation
|
|
|
|
return None;
|
|
|
|
}
|
|
|
|
let pat = let_stmt.pat()?;
|
2022-05-05 12:14:11 -05:00
|
|
|
let mut binders = Vec::new();
|
|
|
|
binders_in_pat(&mut binders, &pat, &ctx.sema)?;
|
2022-04-30 22:19:12 -05:00
|
|
|
|
|
|
|
let target = let_stmt.syntax().text_range();
|
|
|
|
acc.add(
|
|
|
|
AssistId("convert_let_else_to_match", AssistKind::RefactorRewrite),
|
|
|
|
"Convert let-else to let and match",
|
|
|
|
target,
|
|
|
|
|edit| {
|
|
|
|
let indent_level = let_stmt.indent_level().0 as usize;
|
|
|
|
let indent = " ".repeat(indent_level);
|
|
|
|
let indent1 = " ".repeat(indent_level + 1);
|
|
|
|
|
|
|
|
let binders_str = binders_to_str(&binders, false);
|
|
|
|
let binders_str_mut = binders_to_str(&binders, true);
|
|
|
|
|
|
|
|
let init_expr = let_init.syntax().text();
|
|
|
|
let mut pat_no_mut = pat.syntax().text().to_string();
|
|
|
|
// remove the mut from the pattern
|
|
|
|
for (b, ismut) in binders.iter() {
|
|
|
|
if *ismut {
|
2022-05-05 12:14:11 -05:00
|
|
|
pat_no_mut = pat_no_mut.replace(&format!("mut {b}"), &b.to_string());
|
2022-04-30 22:19:12 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
let only_expr = let_else_block.statements().next().is_none();
|
|
|
|
let branch2 = match &let_else_block.tail_expr() {
|
|
|
|
Some(tail) if only_expr => format!("{},", tail.syntax().text()),
|
|
|
|
_ => let_else_block.syntax().text().to_string(),
|
|
|
|
};
|
|
|
|
let replace = if binders.is_empty() {
|
|
|
|
format!(
|
|
|
|
"match {init_expr} {{
|
|
|
|
{indent1}{pat_no_mut} => {binders_str}
|
|
|
|
{indent1}_ => {branch2}
|
|
|
|
{indent}}}"
|
|
|
|
)
|
|
|
|
} else {
|
|
|
|
format!(
|
|
|
|
"let {binders_str_mut} = match {init_expr} {{
|
|
|
|
{indent1}{pat_no_mut} => {binders_str},
|
|
|
|
{indent1}_ => {branch2}
|
|
|
|
{indent}}};"
|
|
|
|
)
|
|
|
|
};
|
|
|
|
edit.replace(target, replace);
|
|
|
|
},
|
|
|
|
)
|
|
|
|
}
|
|
|
|
|
|
|
|
#[cfg(test)]
|
|
|
|
mod tests {
|
|
|
|
use super::*;
|
|
|
|
|
|
|
|
use crate::tests::{check_assist, check_assist_not_applicable, check_assist_target};
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn convert_let_else_to_match_no_type_let() {
|
|
|
|
check_assist_not_applicable(
|
|
|
|
convert_let_else_to_match,
|
|
|
|
r#"
|
|
|
|
fn main() {
|
2022-05-02 16:45:31 -05:00
|
|
|
let 1: u32 = v.iter().sum() else$0 { return };
|
2022-04-30 22:19:12 -05:00
|
|
|
}"#,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2022-05-02 16:45:31 -05:00
|
|
|
#[test]
|
|
|
|
fn convert_let_else_to_match_on_else() {
|
|
|
|
check_assist_not_applicable(
|
|
|
|
convert_let_else_to_match,
|
|
|
|
r#"
|
|
|
|
fn main() {
|
|
|
|
let Ok(x) = f() else {$0 return };
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2022-04-30 22:19:12 -05:00
|
|
|
#[test]
|
|
|
|
fn convert_let_else_to_match_no_macropat() {
|
|
|
|
check_assist_not_applicable(
|
|
|
|
convert_let_else_to_match,
|
|
|
|
r#"
|
|
|
|
fn main() {
|
2022-05-02 16:45:31 -05:00
|
|
|
let m!() = g() else$0 { return };
|
2022-04-30 22:19:12 -05:00
|
|
|
}
|
|
|
|
"#,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn convert_let_else_to_match_target() {
|
|
|
|
check_assist_target(
|
|
|
|
convert_let_else_to_match,
|
|
|
|
r"
|
|
|
|
fn main() {
|
2022-05-02 16:45:31 -05:00
|
|
|
let Ok(x) = f() else$0 { continue };
|
2022-04-30 22:19:12 -05:00
|
|
|
}",
|
|
|
|
"let Ok(x) = f() else { continue };",
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn convert_let_else_to_match_basic() {
|
|
|
|
check_assist(
|
|
|
|
convert_let_else_to_match,
|
|
|
|
r"
|
|
|
|
fn main() {
|
2022-05-02 16:45:31 -05:00
|
|
|
let Ok(x) = f() else$0 { continue };
|
2022-04-30 22:19:12 -05:00
|
|
|
}",
|
|
|
|
r"
|
|
|
|
fn main() {
|
|
|
|
let x = match f() {
|
|
|
|
Ok(x) => x,
|
|
|
|
_ => continue,
|
|
|
|
};
|
|
|
|
}",
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2022-05-05 12:57:47 -05:00
|
|
|
#[test]
|
|
|
|
fn convert_let_else_to_match_const_ref() {
|
|
|
|
check_assist(
|
|
|
|
convert_let_else_to_match,
|
|
|
|
r"
|
|
|
|
enum Option<T> {
|
|
|
|
Some(T),
|
|
|
|
None,
|
|
|
|
}
|
|
|
|
use Option::*;
|
|
|
|
fn main() {
|
|
|
|
let None = f() el$0se { continue };
|
|
|
|
}",
|
|
|
|
r"
|
|
|
|
enum Option<T> {
|
|
|
|
Some(T),
|
|
|
|
None,
|
|
|
|
}
|
|
|
|
use Option::*;
|
|
|
|
fn main() {
|
|
|
|
match f() {
|
|
|
|
None => {}
|
|
|
|
_ => continue,
|
|
|
|
}
|
|
|
|
}",
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn convert_let_else_to_match_const_ref_const() {
|
|
|
|
check_assist(
|
|
|
|
convert_let_else_to_match,
|
|
|
|
r"
|
|
|
|
const NEG1: i32 = -1;
|
|
|
|
fn main() {
|
|
|
|
let NEG1 = f() el$0se { continue };
|
|
|
|
}",
|
|
|
|
r"
|
|
|
|
const NEG1: i32 = -1;
|
|
|
|
fn main() {
|
|
|
|
match f() {
|
|
|
|
NEG1 => {}
|
|
|
|
_ => continue,
|
|
|
|
}
|
|
|
|
}",
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2022-04-30 22:19:12 -05:00
|
|
|
#[test]
|
|
|
|
fn convert_let_else_to_match_mut() {
|
|
|
|
check_assist(
|
|
|
|
convert_let_else_to_match,
|
|
|
|
r"
|
|
|
|
fn main() {
|
2022-05-02 16:45:31 -05:00
|
|
|
let Ok(mut x) = f() el$0se { continue };
|
2022-04-30 22:19:12 -05:00
|
|
|
}",
|
|
|
|
r"
|
|
|
|
fn main() {
|
|
|
|
let mut x = match f() {
|
|
|
|
Ok(x) => x,
|
|
|
|
_ => continue,
|
|
|
|
};
|
|
|
|
}",
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn convert_let_else_to_match_multi_binders() {
|
|
|
|
check_assist(
|
|
|
|
convert_let_else_to_match,
|
|
|
|
r#"
|
|
|
|
fn main() {
|
2022-05-02 16:45:31 -05:00
|
|
|
let ControlFlow::Break((x, "tag", y, ..)) = f() else$0 { g(); return };
|
2022-04-30 22:19:12 -05:00
|
|
|
}"#,
|
|
|
|
r#"
|
|
|
|
fn main() {
|
|
|
|
let (x, y) = match f() {
|
|
|
|
ControlFlow::Break((x, "tag", y, ..)) => (x, y),
|
|
|
|
_ => { g(); return }
|
|
|
|
};
|
|
|
|
}"#,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn convert_let_else_to_match_slice() {
|
|
|
|
check_assist(
|
|
|
|
convert_let_else_to_match,
|
|
|
|
r#"
|
|
|
|
fn main() {
|
2022-05-02 16:45:31 -05:00
|
|
|
let [one, 1001, other] = f() else$0 { break };
|
2022-04-30 22:19:12 -05:00
|
|
|
}"#,
|
|
|
|
r#"
|
|
|
|
fn main() {
|
|
|
|
let (one, other) = match f() {
|
|
|
|
[one, 1001, other] => (one, other),
|
|
|
|
_ => break,
|
|
|
|
};
|
|
|
|
}"#,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn convert_let_else_to_match_struct() {
|
|
|
|
check_assist(
|
|
|
|
convert_let_else_to_match,
|
|
|
|
r#"
|
|
|
|
fn main() {
|
2022-05-02 16:45:31 -05:00
|
|
|
let [Struct { inner: Some(it) }, 1001, other] = f() else$0 { break };
|
2022-04-30 22:19:12 -05:00
|
|
|
}"#,
|
|
|
|
r#"
|
|
|
|
fn main() {
|
|
|
|
let (it, other) = match f() {
|
|
|
|
[Struct { inner: Some(it) }, 1001, other] => (it, other),
|
|
|
|
_ => break,
|
|
|
|
};
|
|
|
|
}"#,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn convert_let_else_to_match_struct_ident_pat() {
|
|
|
|
check_assist(
|
|
|
|
convert_let_else_to_match,
|
|
|
|
r#"
|
|
|
|
fn main() {
|
2022-05-02 16:45:31 -05:00
|
|
|
let [Struct { inner }, 1001, other] = f() else$0 { break };
|
2022-04-30 22:19:12 -05:00
|
|
|
}"#,
|
|
|
|
r#"
|
|
|
|
fn main() {
|
|
|
|
let (inner, other) = match f() {
|
|
|
|
[Struct { inner }, 1001, other] => (inner, other),
|
|
|
|
_ => break,
|
|
|
|
};
|
|
|
|
}"#,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn convert_let_else_to_match_no_binder() {
|
|
|
|
check_assist(
|
|
|
|
convert_let_else_to_match,
|
|
|
|
r#"
|
|
|
|
fn main() {
|
2022-05-02 16:45:31 -05:00
|
|
|
let (8 | 9) = f() else$0 { panic!() };
|
2022-04-30 22:19:12 -05:00
|
|
|
}"#,
|
|
|
|
r#"
|
|
|
|
fn main() {
|
|
|
|
match f() {
|
|
|
|
(8 | 9) => {}
|
|
|
|
_ => panic!(),
|
|
|
|
}
|
|
|
|
}"#,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn convert_let_else_to_match_range() {
|
|
|
|
check_assist(
|
|
|
|
convert_let_else_to_match,
|
|
|
|
r#"
|
|
|
|
fn main() {
|
2022-05-02 16:45:31 -05:00
|
|
|
let 1.. = f() e$0lse { return };
|
2022-04-30 22:19:12 -05:00
|
|
|
}"#,
|
|
|
|
r#"
|
|
|
|
fn main() {
|
|
|
|
match f() {
|
|
|
|
1.. => {}
|
|
|
|
_ => return,
|
|
|
|
}
|
|
|
|
}"#,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn convert_let_else_to_match_refpat() {
|
|
|
|
check_assist(
|
|
|
|
convert_let_else_to_match,
|
|
|
|
r#"
|
|
|
|
fn main() {
|
2022-05-02 16:45:31 -05:00
|
|
|
let Ok(&mut x) = f(&mut 0) else$0 { return };
|
2022-04-30 22:19:12 -05:00
|
|
|
}"#,
|
|
|
|
r#"
|
|
|
|
fn main() {
|
|
|
|
let x = match f(&mut 0) {
|
|
|
|
Ok(&mut x) => x,
|
|
|
|
_ => return,
|
|
|
|
};
|
|
|
|
}"#,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn convert_let_else_to_match_refmut() {
|
|
|
|
check_assist(
|
|
|
|
convert_let_else_to_match,
|
|
|
|
r#"
|
|
|
|
fn main() {
|
2022-05-02 16:45:31 -05:00
|
|
|
let Ok(ref mut x) = f() else$0 { return };
|
2022-04-30 22:19:12 -05:00
|
|
|
}"#,
|
|
|
|
r#"
|
|
|
|
fn main() {
|
|
|
|
let x = match f() {
|
|
|
|
Ok(ref mut x) => x,
|
|
|
|
_ => return,
|
|
|
|
};
|
|
|
|
}"#,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn convert_let_else_to_match_atpat() {
|
|
|
|
check_assist(
|
|
|
|
convert_let_else_to_match,
|
|
|
|
r#"
|
|
|
|
fn main() {
|
2022-05-02 16:45:31 -05:00
|
|
|
let out @ Ok(ins) = f() else$0 { return };
|
2022-04-30 22:19:12 -05:00
|
|
|
}"#,
|
|
|
|
r#"
|
|
|
|
fn main() {
|
|
|
|
let (out, ins) = match f() {
|
|
|
|
out @ Ok(ins) => (out, ins),
|
|
|
|
_ => return,
|
|
|
|
};
|
|
|
|
}"#,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn convert_let_else_to_match_complex_init() {
|
|
|
|
check_assist(
|
|
|
|
convert_let_else_to_match,
|
|
|
|
r#"
|
|
|
|
fn main() {
|
|
|
|
let v = vec![1, 2, 3];
|
2022-05-02 16:45:31 -05:00
|
|
|
let &[mut x, y, ..] = &v.iter().collect::<Vec<_>>()[..] else$0 { return };
|
2022-04-30 22:19:12 -05:00
|
|
|
}"#,
|
|
|
|
r#"
|
|
|
|
fn main() {
|
|
|
|
let v = vec![1, 2, 3];
|
|
|
|
let (mut x, y) = match &v.iter().collect::<Vec<_>>()[..] {
|
|
|
|
&[x, y, ..] => (x, y),
|
|
|
|
_ => return,
|
|
|
|
};
|
|
|
|
}"#,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
}
|