Skip to content

Fix indent for convert_iter_for_each_to_for #20595

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix indent for convert_iter_for_each_to_for #20595

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 17 additions & 10 deletions crates/ide-assists/src/handlers/convert_iter_for_each_to_for.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use ide_db::famous_defs::FamousDefs;
use stdx::format_to;
use syntax::{
AstNode,
ast::{self, HasArgList, HasLoopBody, edit_in_place::Indent, make},
ast::{self, HasArgList, HasLoopBody, edit::AstNodeEdit, make},
};

use crate::{AssistContext, AssistId, Assists};
Expand Down Expand Up @@ -61,11 +61,10 @@ pub(crate) fn convert_iter_for_each_to_for(
stmt.as_ref().map_or_else(|| method.indent_level(), ast::ExprStmt::indent_level);

let block = match body {
ast::Expr::BlockExpr(block) => block,
_ => make::block_expr(Vec::new(), Some(body)),
ast::Expr::BlockExpr(block) => block.reset_indent(),
_ => make::block_expr(Vec::new(), Some(body.reset_indent().indent(1.into()))),
}
.clone_for_update();
block.reindent_to(indent);
.indent(indent);

let expr_for_loop = make::expr_for_loop(param, receiver, block);
builder.replace(range, expr_for_loop.to_string())
Expand Down Expand Up @@ -281,15 +280,23 @@ fn main() {
r#"
//- minicore: iterators
fn main() {
let it = core::iter::repeat(92);
it.$0for_each(|(x, y)| println!("x: {}, y: {}", x, y));
{
let it = core::iter::repeat(92);
it.$0for_each(|param| match param {
(x, y) => println!("x: {}, y: {}", x, y),
});
}
}
"#,
r#"
fn main() {
let it = core::iter::repeat(92);
for (x, y) in it {
println!("x: {}, y: {}", x, y)
{
let it = core::iter::repeat(92);
for param in it {
match param {
(x, y) => println!("x: {}, y: {}", x, y),
}
}
}
}
"#,
Expand Down
Loading