Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-29 06:23:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

flip binexpr works for lhs cmp

Browse source
This commit is contained in:
Matheus Cardoso 2023-08-25 20:14:35 -03:00 committed by Lukas Wirth
parent e18b89452e
commit 3d9221291f
1 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
crates/ide-assists/src/handlers/flip_binexpr.rs
View file

@ -19,8 +19,19 @@ use crate::{AssistContext, AssistId, AssistKind, Assists};
// ``` // ```
pub(crate) fn flip_binexpr(acc: &mut Assists, ctx: &AssistContext<'_>) -> Option<()> { pub(crate) fn flip_binexpr(acc: &mut Assists, ctx: &AssistContext<'_>) -> Option<()> {
let expr = ctx.find_node_at_offset::<BinExpr>()?; let expr = ctx.find_node_at_offset::<BinExpr>()?;
let lhs = expr.lhs()?.syntax().clone();
let rhs = expr.rhs()?.syntax().clone(); let rhs = expr.rhs()?.syntax().clone();
let lhs = expr.lhs()?.syntax().clone();
let lhs = if let Some(bin_expr) = BinExpr::cast(lhs.clone()) {
if bin_expr.op_kind() == expr.op_kind() {
bin_expr.rhs()?.syntax().clone()
} else {
lhs
}
} else {
lhs
};
let op_range = expr.op_token()?.text_range(); let op_range = expr.op_token()?.text_range();
// The assist should be applied only if the cursor is on the operator // The assist should be applied only if the cursor is on the operator
let cursor_in_range = op_range.contains_range(ctx.selection_trimmed()); let cursor_in_range = op_range.contains_range(ctx.selection_trimmed());
@ -33,15 +44,6 @@ pub(crate) fn flip_binexpr(acc: &mut Assists, ctx: &AssistContext<'_>) -> Option
return None; return None;
} }
// If the lhs is a binary expression we check if its rhs can be used as the lhs of the current expression
let lhs = match BinExpr::cast(lhs.clone()) {
Some(lhs) => match lhs.rhs() {
Some(lhs) => lhs,
None => lhs,
},
None => lhs,
};
acc.add( acc.add(
AssistId("flip_binexpr", AssistKind::RefactorRewrite), AssistId("flip_binexpr", AssistKind::RefactorRewrite),
"Flip binary expression", "Flip binary expression",
@ -124,7 +126,7 @@ mod tests {
} }
#[test] #[test]
fn flip_binexpr_works_for_lhs_binexpr() { fn flip_binexpr_works_for_lhs_arith() {
check_assist( check_assist(
flip_binexpr, flip_binexpr,
r"fn f() { let res = 1 + (2 - 3) +$0 4 + 5; }", r"fn f() { let res = 1 + (2 - 3) +$0 4 + 5; }",
@ -132,6 +134,15 @@ mod tests {
) )
} }
#[test]
fn flip_binexpr_works_for_lhs_cmp() {
check_assist(
flip_binexpr,
r"fn f() { let res = 1 + (2 - 3) >$0 4 + 5; }",
r"fn f() { let res = 4 + 5 < 1 + (2 - 3); }",
)
}
#[test] #[test]
fn flip_binexpr_works_inside_match() { fn flip_binexpr_works_inside_match() {
check_assist( check_assist(