mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #15515 - cardoso:flip-binexpr/lhs-binexpr, r=Veykril

Browse Source 
Check if lhs is also a binexpr and use its rhs in flip binexpr assist

Closes #15508

From the original PR, flip binexpr assist is not meant to preserve equivalence, so I went with the simplest solution here.

I can add some extra checks to keep equivalence, but I think they should go in different specific assists (eg. flip arith op / flip logic op / etc), otherwise this one will get out of hand pretty quickly.
This commit is contained in:
bors 2023-12-08 10:38:03 +00:00
commit 5ae781562e
1 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
crates/ide-assists/src/handlers/flip_binexpr.rs
View File

@ -19,8 +19,19 @@
// ```
pub(crate) fn flip_binexpr(acc: &mut Assists, ctx: &AssistContext<'_>) -> Option<()> {
let expr = ctx.find_node_at_offset::<BinExpr>()?;
let lhs = expr.lhs()?.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();
// The assist should be applied only if the cursor is on the operator
let cursor_in_range = op_range.contains_range(ctx.selection_trimmed());
@ -114,6 +125,24 @@ fn flip_binexpr_works_for_complex_expr() {
)
}
#[test]
fn flip_binexpr_works_for_lhs_arith() {
check_assist(
flip_binexpr,
r"fn f() { let res = 1 + (2 - 3) +$0 4 + 5; }",
r"fn f() { let res = 1 + 4 + (2 - 3) + 5; }",
)
}
#[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]
fn flip_binexpr_works_inside_match() {
check_assist(