aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_assists/src/assists
diff options
context:
space:
mode:
authorAleksey Kladov <[email protected]>2020-02-07 11:07:38 +0000
committerAleksey Kladov <[email protected]>2020-02-07 11:14:33 +0000
commitaa1234e02b1166c57dd2a3cd27fd0b0b3c6cba7e (patch)
treef3f9d08b204ddef33054c06e7eff26dfcf1bb0b3 /crates/ra_assists/src/assists
parent5aba5a756a19a54d5c4edd51d8055db36182688b (diff)
Generalize invert_if to just always work
Diffstat (limited to 'crates/ra_assists/src/assists')
-rw-r--r--crates/ra_assists/src/assists/apply_demorgan.rs14
-rw-r--r--crates/ra_assists/src/assists/invert_if.rs33
2 files changed, 30 insertions, 17 deletions
diff --git a/crates/ra_assists/src/assists/apply_demorgan.rs b/crates/ra_assists/src/assists/apply_demorgan.rs
index dac6280ad..ba08a8223 100644
--- a/crates/ra_assists/src/assists/apply_demorgan.rs
+++ b/crates/ra_assists/src/assists/apply_demorgan.rs
@@ -31,12 +31,14 @@ pub(crate) fn apply_demorgan(ctx: AssistCtx) -> Option<Assist> {
31 if !cursor_in_range { 31 if !cursor_in_range {
32 return None; 32 return None;
33 } 33 }
34
34 let lhs = expr.lhs()?; 35 let lhs = expr.lhs()?;
35 let lhs_range = lhs.syntax().text_range(); 36 let lhs_range = lhs.syntax().text_range();
37 let not_lhs = invert_boolean_expression(lhs);
38
36 let rhs = expr.rhs()?; 39 let rhs = expr.rhs()?;
37 let rhs_range = rhs.syntax().text_range(); 40 let rhs_range = rhs.syntax().text_range();
38 let not_lhs = invert_boolean_expression(&lhs)?; 41 let not_rhs = invert_boolean_expression(rhs);
39 let not_rhs = invert_boolean_expression(&rhs)?;
40 42
41 ctx.add_assist(AssistId("apply_demorgan"), "Apply De Morgan's law", |edit| { 43 ctx.add_assist(AssistId("apply_demorgan"), "Apply De Morgan's law", |edit| {
42 edit.target(op_range); 44 edit.target(op_range);
@@ -77,12 +79,12 @@ mod tests {
77 } 79 }
78 80
79 #[test] 81 #[test]
80 fn demorgan_doesnt_apply_with_cursor_not_on_op() { 82 fn demorgan_general_case() {
81 check_assist_not_applicable(apply_demorgan, "fn f() { <|> !x || !x }") 83 check_assist(apply_demorgan, "fn f() { x ||<|> x }", "fn f() { !(!x &&<|> !x) }")
82 } 84 }
83 85
84 #[test] 86 #[test]
85 fn demorgan_doesnt_apply_when_operands_arent_negated_already() { 87 fn demorgan_doesnt_apply_with_cursor_not_on_op() {
86 check_assist_not_applicable(apply_demorgan, "fn f() { x ||<|> x }") 88 check_assist_not_applicable(apply_demorgan, "fn f() { <|> !x || !x }")
87 } 89 }
88} 90}
diff --git a/crates/ra_assists/src/assists/invert_if.rs b/crates/ra_assists/src/assists/invert_if.rs
index 694c3642c..983392f21 100644
--- a/crates/ra_assists/src/assists/invert_if.rs
+++ b/crates/ra_assists/src/assists/invert_if.rs
@@ -1,4 +1,4 @@
1use ra_syntax::ast::{self, AstNode}; 1use ra_syntax::ast::{self, make, AstNode};
2use ra_syntax::T; 2use ra_syntax::T;
3 3
4use crate::{Assist, AssistCtx, AssistId}; 4use crate::{Assist, AssistCtx, AssistId};
@@ -35,8 +35,8 @@ pub(crate) fn invert_if(ctx: AssistCtx) -> Option<Assist> {
35 let then_node = expr.then_branch()?.syntax().clone(); 35 let then_node = expr.then_branch()?.syntax().clone();
36 36
37 if let ast::ElseBranch::Block(else_block) = expr.else_branch()? { 37 if let ast::ElseBranch::Block(else_block) = expr.else_branch()? {
38 let flip_cond = invert_boolean_expression(&cond)?;
39 let cond_range = cond.syntax().text_range(); 38 let cond_range = cond.syntax().text_range();
39 let flip_cond = invert_boolean_expression(cond);
40 let else_node = else_block.syntax(); 40 let else_node = else_block.syntax();
41 let else_range = else_node.text_range(); 41 let else_range = else_node.text_range();
42 let then_range = then_node.text_range(); 42 let then_range = then_node.text_range();
@@ -51,16 +51,23 @@ pub(crate) fn invert_if(ctx: AssistCtx) -> Option<Assist> {
51 None 51 None
52} 52}
53 53
54pub(crate) fn invert_boolean_expression(expr: &ast::Expr) -> Option<ast::Expr> { 54pub(crate) fn invert_boolean_expression(expr: ast::Expr) -> ast::Expr {
55 if let Some(expr) = invert_special_case(&expr) {
56 return expr;
57 }
58 make::expr_prefix(T![!], expr)
59}
60
61pub(crate) fn invert_special_case(expr: &ast::Expr) -> Option<ast::Expr> {
55 match expr { 62 match expr {
56 ast::Expr::BinExpr(bin) => match bin.op_kind()? { 63 ast::Expr::BinExpr(bin) => match bin.op_kind()? {
57 ast::BinOp::NegatedEqualityTest => bin.replace_op(T![==]).map(|it| it.into()), 64 ast::BinOp::NegatedEqualityTest => bin.replace_op(T![==]).map(|it| it.into()),
65 ast::BinOp::EqualityTest => bin.replace_op(T![!=]).map(|it| it.into()),
58 _ => None, 66 _ => None,
59 }, 67 },
60 ast::Expr::PrefixExpr(pe) => match pe.op_kind()? { 68 ast::Expr::PrefixExpr(pe) if pe.op_kind()? == ast::PrefixOp::Not => pe.expr(),
61 ast::PrefixOp::Not => pe.expr(), 69 // FIXME:
62 _ => None, 70 // ast::Expr::Literal(true | false )
63 },
64 _ => None, 71 _ => None,
65 } 72 }
66} 73}
@@ -90,12 +97,16 @@ mod tests {
90 } 97 }
91 98
92 #[test] 99 #[test]
93 fn invert_if_doesnt_apply_with_cursor_not_on_if() { 100 fn invert_if_general_case() {
94 check_assist_not_applicable(invert_if, "fn f() { if !<|>cond { 3 * 2 } else { 1 } }") 101 check_assist(
102 invert_if,
103 "fn f() { i<|>f cond { 3 * 2 } else { 1 } }",
104 "fn f() { i<|>f !cond { 1 } else { 3 * 2 } }",
105 )
95 } 106 }
96 107
97 #[test] 108 #[test]
98 fn invert_if_doesnt_apply_without_negated() { 109 fn invert_if_doesnt_apply_with_cursor_not_on_if() {
99 check_assist_not_applicable(invert_if, "fn f() { i<|>f cond { 3 * 2 } else { 1 } }") 110 check_assist_not_applicable(invert_if, "fn f() { if !<|>cond { 3 * 2 } else { 1 } }")
100 } 111 }
101} 112}