Skip to content

fix: handle method calls in apply_demorgan #20973

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 6, 2025
Merged

fix: handle method calls in apply_demorgan #20973

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9b8265
fix demorgan assist to handle method call
Natural-selection1 Nov 5, 2025
06668b6
refactor
Natural-selection1 Nov 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 52 additions & 28 deletions crates/ide-assists/src/handlers/apply_demorgan.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,40 +124,37 @@ pub(crate) fn apply_demorgan(acc: &mut Assists, ctx: &AssistContext<'_>) -> Opti
op_range,
|builder| {
let make = SyntaxFactory::with_mappings();
let paren_expr = bin_expr.syntax().parent().and_then(ast::ParenExpr::cast);
let neg_expr = paren_expr
.clone()
let (target_node, result_expr) = if let Some(neg_expr) = bin_expr
.syntax()
.parent()
.and_then(ast::ParenExpr::cast)
.and_then(|paren_expr| paren_expr.syntax().parent())
.and_then(ast::PrefixExpr::cast)
.filter(|prefix_expr| matches!(prefix_expr.op_kind(), Some(ast::UnaryOp::Not)))
.map(ast::Expr::PrefixExpr);

let mut editor;
if let Some(paren_expr) = paren_expr {
if let Some(neg_expr) = neg_expr {
cov_mark::hit!(demorgan_double_negation);
let parent = neg_expr.syntax().parent();
editor = builder.make_editor(neg_expr.syntax());

if parent.is_some_and(|parent| {
demorganed.needs_parens_in_place_of(&parent, neg_expr.syntax())
}) {
cov_mark::hit!(demorgan_keep_parens_for_op_precedence2);
editor.replace(neg_expr.syntax(), make.expr_paren(demorganed).syntax());
} else {
editor.replace(neg_expr.syntax(), demorganed.syntax());
};
} else {
cov_mark::hit!(demorgan_double_parens);
editor = builder.make_editor(paren_expr.syntax());
{
cov_mark::hit!(demorgan_double_negation);
(ast::Expr::from(neg_expr).syntax().clone(), demorganed)
} else if let Some(paren_expr) =
bin_expr.syntax().parent().and_then(ast::ParenExpr::cast)
{
cov_mark::hit!(demorgan_double_parens);
(paren_expr.syntax().clone(), add_bang_paren(&make, demorganed))
} else {
(bin_expr.syntax().clone(), add_bang_paren(&make, demorganed))
};

editor.replace(paren_expr.syntax(), add_bang_paren(&make, demorganed).syntax());
}
let final_expr = if target_node
.parent()
.is_some_and(|p| result_expr.needs_parens_in_place_of(&p, &target_node))
{
cov_mark::hit!(demorgan_keep_parens_for_op_precedence2);
make.expr_paren(result_expr).into()
} else {
editor = builder.make_editor(bin_expr.syntax());
editor.replace(bin_expr.syntax(), add_bang_paren(&make, demorganed).syntax());
}
result_expr
};

let mut editor = builder.make_editor(&target_node);
editor.replace(&target_node, final_expr.syntax());
editor.add_mappings(make.finish_with_mappings());
builder.add_file_edits(ctx.vfs_file_id(), editor);
},
Expand Down Expand Up @@ -636,4 +633,31 @@ fn main() {
"#,
);
}

#[test]
fn demorgan_method_call_receiver() {
check_assist(
apply_demorgan,
"fn f() { (x ||$0 !y).then_some(42) }",
"fn f() { (!(!x && y)).then_some(42) }",
);
}

#[test]
fn demorgan_method_call_receiver_complex() {
check_assist(
apply_demorgan,
"fn f() { (a && b ||$0 c && d).then_some(42) }",
"fn f() { (!(!(a && b) && !(c && d))).then_some(42) }",
);
}

#[test]
fn demorgan_method_call_receiver_chained() {
check_assist(
apply_demorgan,
"fn f() { (a ||$0 b).then_some(42).or(Some(0)) }",
"fn f() { (!(!a && !b)).then_some(42).or(Some(0)) }",
);
}
}