From 481d3f56cf012789741d5d238f587b87b427a0f4 Mon Sep 17 00:00:00 2001 From: Marco Groppo Date: Sun, 24 Mar 2019 14:31:44 +0100 Subject: Assist to flip equality (==) and negative equality (!=) operands. --- crates/ra_assists/src/flip_eq_operands.rs | 87 +++++++++++++++++++++++++++++++ crates/ra_assists/src/lib.rs | 2 + 2 files changed, 89 insertions(+) create mode 100644 crates/ra_assists/src/flip_eq_operands.rs (limited to 'crates') diff --git a/crates/ra_assists/src/flip_eq_operands.rs b/crates/ra_assists/src/flip_eq_operands.rs new file mode 100644 index 000000000..22494a7c7 --- /dev/null +++ b/crates/ra_assists/src/flip_eq_operands.rs @@ -0,0 +1,87 @@ +use hir::db::HirDatabase; +use ra_syntax::{ + ast::{AstNode, BinExpr, BinOp} +}; + +use crate::{AssistCtx, Assist, AssistId}; + +pub(crate) fn flip_eq_operands(mut ctx: AssistCtx) -> Option { + let expr = ctx.node_at_offset::()?; + let allowed_ops = [BinOp::EqualityTest, BinOp::NegatedEqualityTest]; + let expr_op = expr.op()?; + if ! allowed_ops.iter().any(|o| *o == expr_op) { + return None; + } + let node = expr.syntax(); + let prev = node.first_child()?; + let next = node.last_child()?; + ctx.add_action(AssistId("flip_eq_operands"), "flip equality operands", |edit| { + edit.target(node.range()); + edit.replace(prev.range(), next.text()); + edit.replace(next.range(), prev.text()); + }); + + ctx.build() +} + +#[cfg(test)] +mod tests { + use super::*; + + use crate::helpers::{check_assist, check_assist_target}; + + #[test] + fn flip_eq_operands_for_simple_stmt() { + check_assist( + flip_eq_operands, + "fn f() { let res = 1 ==<|> 2; }", + "fn f() { let res = 2 ==<|> 1; }", + ) + } + + #[test] + fn flip_neq_operands_for_simple_stmt() { + check_assist( + flip_eq_operands, + "fn f() { let res = 1 !=<|> 2; }", + "fn f() { let res = 2 !=<|> 1; }", + ) + } + + #[test] + fn flip_eq_operands_for_complex_stmt() { + check_assist( + flip_eq_operands, + "fn f() { let res = (1 + 1) ==<|> (2 + 2); }", + "fn f() { let res = (2 + 2) ==<|> (1 + 1); }", + ) + } + + #[test] + fn flip_eq_operands_in_match_expr() { + check_assist( + flip_eq_operands, + r#" + fn dyn_eq(&self, other: &dyn Diagnostic) -> bool { + match other.downcast_ref::() { + None => false, + Some(it) => it ==<|> self, + } + } + "#, + r#" + fn dyn_eq(&self, other: &dyn Diagnostic) -> bool { + match other.downcast_ref::() { + None => false, + Some(it) => self ==<|> it, + } + } + "#, + ) + } + + #[test] + fn flip_eq_operands_target() { + check_assist_target(flip_eq_operands, "fn f() { let res = 1 ==<|> 2; }", "1 == 2") + } +} diff --git a/crates/ra_assists/src/lib.rs b/crates/ra_assists/src/lib.rs index 871b37f58..eb5248ae4 100644 --- a/crates/ra_assists/src/lib.rs +++ b/crates/ra_assists/src/lib.rs @@ -88,6 +88,7 @@ where mod add_derive; mod add_impl; mod flip_comma; +mod flip_eq_operands; mod change_visibility; mod fill_match_arms; mod fill_struct_fields; @@ -106,6 +107,7 @@ fn all_assists() -> &'static [fn(AssistCtx) -> Option