bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/ide-assists/src/handlers/convert_range_for_to_while.rs')
-rw-r--r--crates/ide-assists/src/handlers/convert_range_for_to_while.rs48
1 files changed, 19 insertions, 29 deletions
diff --git a/crates/ide-assists/src/handlers/convert_range_for_to_while.rs b/crates/ide-assists/src/handlers/convert_range_for_to_while.rs
index 6139395076..b0b9695f0f 100644
--- a/crates/ide-assists/src/handlers/convert_range_for_to_while.rs
+++ b/crates/ide-assists/src/handlers/convert_range_for_to_while.rs
@@ -5,10 +5,7 @@ use syntax::{
SyntaxKind::WHITESPACE,
T,
algo::previous_non_trivia_token,
- ast::{
- self, HasArgList, HasLoopBody, HasName, RangeItem, edit::AstNodeEdit, make,
- syntax_factory::SyntaxFactory,
- },
+ ast::{self, HasArgList, HasLoopBody, HasName, RangeItem, edit::AstNodeEdit, make},
syntax_editor::{Element, Position, SyntaxEditor},
};
@@ -55,56 +52,49 @@ pub(crate) fn convert_range_for_to_while(acc: &mut Assists, ctx: &AssistContext<
description,
for_.syntax().text_range(),
|builder| {
- let mut edit = builder.make_editor(for_.syntax());
- let make = SyntaxFactory::with_mappings();
+ let mut editor = builder.make_editor(for_.syntax());
let indent = for_.indent_level();
- let pat = make.ident_pat(pat.ref_token().is_some(), true, name.clone());
- let let_stmt = make.let_stmt(pat.into(), None, Some(start));
- edit.insert_all(
+ let pat = editor.make().ident_pat(pat.ref_token().is_some(), true, name.clone());
+ let let_stmt = editor.make().let_stmt(pat.into(), None, Some(start));
+ editor.insert_all(
Position::before(for_.syntax()),
vec![
let_stmt.syntax().syntax_element(),
- make.whitespace(&format!("\n{}", indent)).syntax_element(),
+ editor.make().whitespace(&format!("\n{}", indent)).syntax_element(),
],
);
let mut elements = vec![];
- let var_expr = make.expr_path(make.ident_path(&name.text()));
+ let var_expr = editor.make().expr_path(editor.make().ident_path(&name.text()));
let op = ast::BinaryOp::CmpOp(ast::CmpOp::Ord {
ordering: ast::Ordering::Less,
strict: !inclusive,
});
if let Some(end) = end {
elements.extend([
- make.token(T![while]).syntax_element(),
- make.whitespace(" ").syntax_element(),
- make.expr_bin(var_expr.clone(), op, end).syntax().syntax_element(),
+ editor.make().token(T![while]).syntax_element(),
+ editor.make().whitespace(" ").syntax_element(),
+ editor.make().expr_bin(var_expr.clone(), op, end).syntax().syntax_element(),
]);
} else {
- elements.push(make.token(T![loop]).syntax_element());
+ elements.push(editor.make().token(T![loop]).syntax_element());
}
- edit.replace_all(
+ editor.replace_all(
for_kw.syntax_element()..=iterable.syntax().syntax_element(),
elements,
);
let op = ast::BinaryOp::Assignment { op: Some(ast::ArithOp::Add) };
- process_loop_body(
- body,
- label,
- &mut edit,
- vec![
- make.whitespace(&format!("\n{}", indent + 1)).syntax_element(),
- make.expr_bin(var_expr, op, step).syntax().syntax_element(),
- make.token(T![;]).syntax_element(),
- ],
- );
-
- edit.add_mappings(make.finish_with_mappings());
- builder.add_file_edits(ctx.vfs_file_id(), edit);
+ let incrementer = vec![
+ editor.make().whitespace(&format!("\n{}", indent + 1)).syntax_element(),
+ editor.make().expr_bin(var_expr, op, step).syntax().syntax_element(),
+ editor.make().token(T![;]).syntax_element(),
+ ];
+ process_loop_body(body, label, &mut editor, incrementer);
+ builder.add_file_edits(ctx.vfs_file_id(), editor);
},
)
}