2020-03-26 04:16:10 -05:00
|
|
|
use std::iter;
|
|
|
|
|
|
|
|
use ra_syntax::{
|
2020-05-09 07:40:11 -05:00
|
|
|
ast::{
|
|
|
|
self,
|
|
|
|
edit::{AstNodeEdit, IndentLevel},
|
|
|
|
make,
|
|
|
|
},
|
2020-03-26 04:16:10 -05:00
|
|
|
AstNode,
|
|
|
|
};
|
|
|
|
|
2020-05-06 11:45:35 -05:00
|
|
|
use crate::{utils::TryEnum, AssistContext, AssistId, Assists};
|
2020-03-26 04:16:10 -05:00
|
|
|
|
|
|
|
// Assist: replace_unwrap_with_match
|
|
|
|
//
|
|
|
|
// Replaces `unwrap` a `match` expression. Works for Result and Option.
|
|
|
|
//
|
|
|
|
// ```
|
|
|
|
// enum Result<T, E> { Ok(T), Err(E) }
|
|
|
|
// fn main() {
|
|
|
|
// let x: Result<i32, i32> = Result::Ok(92);
|
|
|
|
// let y = x.<|>unwrap();
|
|
|
|
// }
|
|
|
|
// ```
|
|
|
|
// ->
|
|
|
|
// ```
|
|
|
|
// enum Result<T, E> { Ok(T), Err(E) }
|
|
|
|
// fn main() {
|
|
|
|
// let x: Result<i32, i32> = Result::Ok(92);
|
|
|
|
// let y = match x {
|
|
|
|
// Ok(a) => a,
|
|
|
|
// _ => unreachable!(),
|
|
|
|
// };
|
|
|
|
// }
|
|
|
|
// ```
|
2020-05-06 11:45:35 -05:00
|
|
|
pub(crate) fn replace_unwrap_with_match(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
|
2020-03-26 04:16:10 -05:00
|
|
|
let method_call: ast::MethodCallExpr = ctx.find_node_at_offset()?;
|
|
|
|
let name = method_call.name_ref()?;
|
|
|
|
if name.text() != "unwrap" {
|
|
|
|
return None;
|
|
|
|
}
|
|
|
|
let caller = method_call.expr()?;
|
|
|
|
let ty = ctx.sema.type_of_expr(&caller)?;
|
2020-05-06 11:45:35 -05:00
|
|
|
let happy_variant = TryEnum::from_ty(&ctx.sema, &ty)?.happy_case();
|
2020-05-06 05:51:28 -05:00
|
|
|
let target = method_call.syntax().text_range();
|
2020-05-06 11:45:35 -05:00
|
|
|
acc.add(AssistId("replace_unwrap_with_match"), "Replace unwrap with match", target, |edit| {
|
|
|
|
let ok_path = make::path_unqualified(make::path_segment(make::name_ref(happy_variant)));
|
|
|
|
let it = make::bind_pat(make::name("a")).into();
|
|
|
|
let ok_tuple = make::tuple_struct_pat(ok_path, iter::once(it)).into();
|
2020-03-26 04:16:10 -05:00
|
|
|
|
2020-05-06 11:45:35 -05:00
|
|
|
let bind_path = make::path_unqualified(make::path_segment(make::name_ref("a")));
|
|
|
|
let ok_arm = make::match_arm(iter::once(ok_tuple), make::expr_path(bind_path));
|
2020-03-26 04:16:10 -05:00
|
|
|
|
2020-05-19 18:28:11 -05:00
|
|
|
let unreachable_call = make::expr_unreachable();
|
2020-05-06 11:45:35 -05:00
|
|
|
let err_arm = make::match_arm(iter::once(make::placeholder_pat().into()), unreachable_call);
|
2020-03-26 04:16:10 -05:00
|
|
|
|
2020-05-06 11:45:35 -05:00
|
|
|
let match_arm_list = make::match_arm_list(vec![ok_arm, err_arm]);
|
2020-05-09 07:40:11 -05:00
|
|
|
let match_expr = make::expr_match(caller.clone(), match_arm_list)
|
|
|
|
.indent(IndentLevel::from_node(method_call.syntax()));
|
2020-03-26 04:16:10 -05:00
|
|
|
|
2020-05-06 11:45:35 -05:00
|
|
|
edit.set_cursor(caller.syntax().text_range().start());
|
|
|
|
edit.replace_ast::<ast::Expr>(method_call.into(), match_expr);
|
|
|
|
})
|
2020-03-26 04:16:10 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
#[cfg(test)]
|
|
|
|
mod tests {
|
|
|
|
use super::*;
|
2020-05-06 03:16:55 -05:00
|
|
|
use crate::tests::{check_assist, check_assist_target};
|
2020-03-26 04:16:10 -05:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_replace_result_unwrap_with_match() {
|
|
|
|
check_assist(
|
|
|
|
replace_unwrap_with_match,
|
|
|
|
r"
|
|
|
|
enum Result<T, E> { Ok(T), Err(E) }
|
|
|
|
fn i<T>(a: T) -> T { a }
|
|
|
|
fn main() {
|
|
|
|
let x: Result<i32, i32> = Result::Ok(92);
|
|
|
|
let y = i(x).<|>unwrap();
|
|
|
|
}
|
|
|
|
",
|
|
|
|
r"
|
|
|
|
enum Result<T, E> { Ok(T), Err(E) }
|
|
|
|
fn i<T>(a: T) -> T { a }
|
|
|
|
fn main() {
|
|
|
|
let x: Result<i32, i32> = Result::Ok(92);
|
|
|
|
let y = <|>match i(x) {
|
|
|
|
Ok(a) => a,
|
|
|
|
_ => unreachable!(),
|
|
|
|
};
|
|
|
|
}
|
|
|
|
",
|
|
|
|
)
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_replace_option_unwrap_with_match() {
|
|
|
|
check_assist(
|
|
|
|
replace_unwrap_with_match,
|
|
|
|
r"
|
|
|
|
enum Option<T> { Some(T), None }
|
|
|
|
fn i<T>(a: T) -> T { a }
|
|
|
|
fn main() {
|
|
|
|
let x = Option::Some(92);
|
|
|
|
let y = i(x).<|>unwrap();
|
|
|
|
}
|
|
|
|
",
|
|
|
|
r"
|
|
|
|
enum Option<T> { Some(T), None }
|
|
|
|
fn i<T>(a: T) -> T { a }
|
|
|
|
fn main() {
|
|
|
|
let x = Option::Some(92);
|
|
|
|
let y = <|>match i(x) {
|
|
|
|
Some(a) => a,
|
|
|
|
_ => unreachable!(),
|
|
|
|
};
|
|
|
|
}
|
|
|
|
",
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_replace_result_unwrap_with_match_chaining() {
|
|
|
|
check_assist(
|
|
|
|
replace_unwrap_with_match,
|
|
|
|
r"
|
|
|
|
enum Result<T, E> { Ok(T), Err(E) }
|
|
|
|
fn i<T>(a: T) -> T { a }
|
|
|
|
fn main() {
|
|
|
|
let x: Result<i32, i32> = Result::Ok(92);
|
|
|
|
let y = i(x).<|>unwrap().count_zeroes();
|
|
|
|
}
|
|
|
|
",
|
|
|
|
r"
|
|
|
|
enum Result<T, E> { Ok(T), Err(E) }
|
|
|
|
fn i<T>(a: T) -> T { a }
|
|
|
|
fn main() {
|
|
|
|
let x: Result<i32, i32> = Result::Ok(92);
|
|
|
|
let y = <|>match i(x) {
|
|
|
|
Ok(a) => a,
|
|
|
|
_ => unreachable!(),
|
|
|
|
}.count_zeroes();
|
|
|
|
}
|
|
|
|
",
|
|
|
|
)
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn replace_unwrap_with_match_target() {
|
|
|
|
check_assist_target(
|
|
|
|
replace_unwrap_with_match,
|
|
|
|
r"
|
|
|
|
enum Option<T> { Some(T), None }
|
|
|
|
fn i<T>(a: T) -> T { a }
|
|
|
|
fn main() {
|
|
|
|
let x = Option::Some(92);
|
|
|
|
let y = i(x).<|>unwrap();
|
|
|
|
}
|
|
|
|
",
|
|
|
|
r"i(x).unwrap()",
|
|
|
|
);
|
|
|
|
}
|
|
|
|
}
|