Skip to content

Commit 79b4e67

Browse files
committed
fix: defer condition construction
1 parent fb90bf9 commit 79b4e67

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

crates/ide_assists/src/handlers/convert_while_to_loop.rs

+3-5
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,8 @@ pub(crate) fn convert_while_to_loop(acc: &mut Assists, ctx: &AssistContext) -> O
4242
let while_expr = while_kw.parent().and_then(ast::WhileExpr::cast)?;
4343
let while_body = while_expr.loop_body()?;
4444
let while_cond = while_expr.condition()?;
45+
let while_cond_expr = while_cond.expr()?;
4546

46-
let if_cond = match while_cond.pat() {
47-
Some(_) => while_expr.condition()?,
48-
None => make::condition(invert_boolean_expression(while_cond.expr()?), None),
49-
};
5047
let target = while_expr.syntax().text_range();
5148
acc.add(
5249
AssistId("convert_while_to_loop", AssistKind::RefactorRewrite),
@@ -60,11 +57,12 @@ pub(crate) fn convert_while_to_loop(acc: &mut Assists, ctx: &AssistContext) -> O
6057
.indent(while_indent_level);
6158
let block_expr = match while_cond.pat() {
6259
Some(_) => {
63-
let if_expr = make::expr_if(if_cond, while_body, Some(break_block.into()));
60+
let if_expr = make::expr_if(while_cond, while_body, Some(break_block.into()));
6461
let stmts = once(make::expr_stmt(if_expr).into());
6562
make::block_expr(stmts, None)
6663
}
6764
None => {
65+
let if_cond = make::condition(invert_boolean_expression(while_cond_expr), None);
6866
let if_expr = make::expr_if(if_cond, break_block, None);
6967
let stmts =
7068
once(make::expr_stmt(if_expr).into()).chain(while_body.statements());

0 commit comments

Comments
 (0)