diff --git a/crates/ide-assists/src/handlers/convert_for_to_while_let.rs b/crates/ide-assists/src/handlers/convert_for_to_while_let.rs
index 2d6a59a7c365..b281d5a02e53 100644
--- a/crates/ide-assists/src/handlers/convert_for_to_while_let.rs
+++ b/crates/ide-assists/src/handlers/convert_for_to_while_let.rs
@@ -1,11 +1,8 @@
-use hir::{
-    Name,
-    sym::{self},
-};
+use hir::{Name, sym};
 use ide_db::{famous_defs::FamousDefs, syntax_helpers::suggest_name};
 use syntax::{
     AstNode,
-    ast::{self, HasLoopBody, edit::IndentLevel, make, syntax_factory::SyntaxFactory},
+    ast::{self, HasAttrs, HasLoopBody, edit::IndentLevel, make, syntax_factory::SyntaxFactory},
     syntax_editor::Position,
 };
 
@@ -82,6 +79,18 @@ pub(crate) fn convert_for_loop_to_while_let(
                 Some(iterable),
             );
             let indent = IndentLevel::from_node(for_loop.syntax());
+
+            if let Some(label) = for_loop.label() {
+                let label = label.syntax().clone_for_update();
+                editor.insert(Position::before(for_loop.syntax()), make.whitespace(" "));
+                editor.insert(Position::before(for_loop.syntax()), label);
+            }
+            crate::utils::insert_attributes(
+                for_loop.syntax(),
+                &mut editor,
+                for_loop.attrs().map(|it| it.clone_for_update()),
+            );
+
             editor.insert(
                 Position::before(for_loop.syntax()),
                 make::tokens::whitespace(format!("\n{indent}").as_str()),
@@ -186,6 +195,56 @@ fn main() {
         )
     }
 
+    #[test]
+    fn each_to_for_with_label() {
+        check_assist(
+            convert_for_loop_to_while_let,
+            r"
+fn main() {
+    let mut x = vec![1, 2, 3];
+    'a: for $0v in x {
+        v *= 2;
+        break 'a;
+    };
+}",
+            r"
+fn main() {
+    let mut x = vec![1, 2, 3];
+    let mut tmp = x.into_iter();
+    'a: while let Some(v) = tmp.next() {
+        v *= 2;
+        break 'a;
+    };
+}",
+        )
+    }
+
+    #[test]
+    fn each_to_for_with_attributes() {
+        check_assist(
+            convert_for_loop_to_while_let,
+            r"
+fn main() {
+    let mut x = vec![1, 2, 3];
+    #[allow(unused)]
+    #[deny(unsafe_code)]
+    for $0v in x {
+        v *= 2;
+    };
+}",
+            r"
+fn main() {
+    let mut x = vec![1, 2, 3];
+    let mut tmp = x.into_iter();
+    #[allow(unused)]
+    #[deny(unsafe_code)]
+    while let Some(v) = tmp.next() {
+        v *= 2;
+    };
+}",
+        )
+    }
+
     #[test]
     fn each_to_for_for_in_range() {
         check_assist(
diff --git a/crates/ide-assists/src/handlers/convert_while_to_loop.rs b/crates/ide-assists/src/handlers/convert_while_to_loop.rs
index dbe3ee0ed603..9fd8b4b3159e 100644
--- a/crates/ide-assists/src/handlers/convert_while_to_loop.rs
+++ b/crates/ide-assists/src/handlers/convert_while_to_loop.rs
@@ -1,6 +1,5 @@
 use std::iter;
 
-use either::Either;
 use ide_db::syntax_helpers::node_ext::is_pattern_cond;
 use syntax::{
     AstNode, T,
@@ -9,6 +8,7 @@ use syntax::{
         edit::{AstNodeEdit, IndentLevel},
         make,
     },
+    syntax_editor::{Element, Position},
 };
 
 use crate::{
@@ -44,43 +44,53 @@ pub(crate) fn convert_while_to_loop(acc: &mut Assists, ctx: &AssistContext<'_>)
     let while_expr = while_kw.parent().and_then(ast::WhileExpr::cast)?;
     let while_body = while_expr.loop_body()?;
     let while_cond = while_expr.condition()?;
+    let l_curly = while_body.stmt_list()?.l_curly_token()?;
 
     let target = while_expr.syntax().text_range();
     acc.add(
         AssistId::refactor_rewrite("convert_while_to_loop"),
         "Convert while to loop",
         target,
-        |edit| {
+        |builder| {
+            let mut edit = builder.make_editor(while_expr.syntax());
             let while_indent_level = IndentLevel::from_node(while_expr.syntax());
 
             let break_block = make::block_expr(
                 iter::once(make::expr_stmt(make::expr_break(None, None)).into()),
                 None,
             )
-            .indent(while_indent_level);
-            let block_expr = if is_pattern_cond(while_cond.clone()) {
-                let if_expr = make::expr_if(while_cond, while_body, Some(break_block.into()));
+            .indent(IndentLevel(1));
+
+            edit.replace_all(
+                while_kw.syntax_element()..=while_cond.syntax().syntax_element(),
+                vec![make::token(T![loop]).syntax_element()],
+            );
+
+            if is_pattern_cond(while_cond.clone()) {
+                let then_branch = while_body.reset_indent().indent(IndentLevel(1));
+                let if_expr = make::expr_if(while_cond, then_branch, Some(break_block.into()));
                 let stmts = iter::once(make::expr_stmt(if_expr.into()).into());
-                make::block_expr(stmts, None)
+                let block_expr = make::block_expr(stmts, None);
+                edit.replace(while_body.syntax(), block_expr.indent(while_indent_level).syntax());
             } else {
                 let if_cond = invert_boolean_expression_legacy(while_cond);
-                let if_expr = make::expr_if(if_cond, break_block, None).syntax().clone().into();
-                let elements = while_body.stmt_list().map_or_else(
-                    || Either::Left(iter::empty()),
-                    |stmts| {
-                        Either::Right(stmts.syntax().children_with_tokens().filter(|node_or_tok| {
-                            // Filter out the trailing expr
-                            !node_or_tok
-                                .as_node()
-                                .is_some_and(|node| ast::Expr::can_cast(node.kind()))
-                        }))
-                    },
+                let if_expr = make::expr_if(if_cond, break_block, None).indent(while_indent_level);
+                if !while_body.syntax().text().contains_char('\n') {
+                    edit.insert(
+                        Position::after(&l_curly),
+                        make::tokens::whitespace(&format!("\n{while_indent_level}")),
+                    );
+                }
+                edit.insert_all(
+                    Position::after(&l_curly),
+                    vec![
+                        make::tokens::whitespace(&format!("\n{}", while_indent_level + 1)).into(),
+                        if_expr.syntax().syntax_element(),
+                    ],
                 );
-                make::hacky_block_expr(iter::once(if_expr).chain(elements), while_body.tail_expr())
             };
 
-            let replacement = make::expr_loop(block_expr.indent(while_indent_level));
-            edit.replace(target, replacement.syntax().text())
+            builder.add_file_edits(ctx.vfs_file_id(), edit);
         },
     )
 }
@@ -115,6 +125,110 @@ fn main() {
         );
     }
 
+    #[test]
+    fn convert_with_label() {
+        check_assist(
+            convert_while_to_loop,
+            r#"
+fn main() {
+    'x: while$0 cond {
+        foo();
+        break 'x
+    }
+}
+"#,
+            r#"
+fn main() {
+    'x: loop {
+        if !cond {
+            break;
+        }
+        foo();
+        break 'x
+    }
+}
+"#,
+        );
+
+        check_assist(
+            convert_while_to_loop,
+            r#"
+fn main() {
+    'x: while$0 let Some(x) = cond {
+        foo();
+        break 'x
+    }
+}
+"#,
+            r#"
+fn main() {
+    'x: loop {
+        if let Some(x) = cond {
+            foo();
+            break 'x
+        } else {
+            break;
+        }
+    }
+}
+"#,
+        );
+    }
+
+    #[test]
+    fn convert_with_attributes() {
+        check_assist(
+            convert_while_to_loop,
+            r#"
+fn main() {
+    #[allow(unused)]
+    while$0 cond {
+        foo();
+        break 'x
+    }
+}
+"#,
+            r#"
+fn main() {
+    #[allow(unused)]
+    loop {
+        if !cond {
+            break;
+        }
+        foo();
+        break 'x
+    }
+}
+"#,
+        );
+
+        check_assist(
+            convert_while_to_loop,
+            r#"
+fn main() {
+    #[allow(unused)]
+    #[deny(unsafe_code)]
+    while$0 let Some(x) = cond {
+        foo();
+    }
+}
+"#,
+            r#"
+fn main() {
+    #[allow(unused)]
+    #[deny(unsafe_code)]
+    loop {
+        if let Some(x) = cond {
+            foo();
+        } else {
+            break;
+        }
+    }
+}
+"#,
+        );
+    }
+
     #[test]
     fn convert_busy_wait() {
         check_assist(
@@ -185,6 +299,76 @@ fn main() {
         );
     }
 
+    #[test]
+    fn indentation() {
+        check_assist(
+            convert_while_to_loop,
+            r#"
+fn main() {
+    {
+        {
+            while$0 cond {
+                foo(
+                    "xxx",
+                );
+            }
+        }
+    }
+}
+"#,
+            r#"
+fn main() {
+    {
+        {
+            loop {
+                if !cond {
+                    break;
+                }
+                foo(
+                    "xxx",
+                );
+            }
+        }
+    }
+}
+"#,
+        );
+
+        check_assist(
+            convert_while_to_loop,
+            r#"
+fn main() {
+    {
+        {
+            while$0 let Some(_) = foo() {
+                bar(
+                    "xxx",
+                );
+            }
+        }
+    }
+}
+"#,
+            r#"
+fn main() {
+    {
+        {
+            loop {
+                if let Some(_) = foo() {
+                    bar(
+                        "xxx",
+                    );
+                } else {
+                    break;
+                }
+            }
+        }
+    }
+}
+"#,
+        );
+    }
+
     #[test]
     fn ignore_cursor_in_body() {
         check_assist_not_applicable(
diff --git a/crates/ide-assists/src/utils.rs b/crates/ide-assists/src/utils.rs
index 20e0302b57d7..7bca451c5e31 100644
--- a/crates/ide-assists/src/utils.rs
+++ b/crates/ide-assists/src/utils.rs
@@ -27,7 +27,7 @@ use syntax::{
         make,
         syntax_factory::SyntaxFactory,
     },
-    syntax_editor::{Removable, SyntaxEditor},
+    syntax_editor::{Element, Removable, SyntaxEditor},
 };
 
 use crate::{
@@ -385,6 +385,28 @@ fn invert_special_case_legacy(expr: &ast::Expr) -> Option<ast::Expr> {
     }
 }
 
+pub(crate) fn insert_attributes(
+    before: impl Element,
+    edit: &mut SyntaxEditor,
+    attrs: impl IntoIterator<Item = ast::Attr>,
+) {
+    let mut attrs = attrs.into_iter().peekable();
+    if attrs.peek().is_none() {
+        return;
+    }
+    let elem = before.syntax_element();
+    let indent = IndentLevel::from_element(&elem);
+    let whitespace = format!("\n{indent}");
+    edit.insert_all(
+        syntax::syntax_editor::Position::before(elem),
+        attrs
+            .flat_map(|attr| {
+                [attr.syntax().clone().into(), make::tokens::whitespace(&whitespace).into()]
+            })
+            .collect(),
+    );
+}
+
 pub(crate) fn next_prev() -> impl Iterator<Item = Direction> {
     [Direction::Next, Direction::Prev].into_iter()
 }
diff --git a/crates/syntax/src/ast/make.rs b/crates/syntax/src/ast/make.rs
index 051c5835571b..dba39204e32e 100644
--- a/crates/syntax/src/ast/make.rs
+++ b/crates/syntax/src/ast/make.rs
@@ -1355,7 +1355,7 @@ pub mod tokens {
 
     pub(super) static SOURCE_FILE: LazyLock<Parse<SourceFile>> = LazyLock::new(|| {
         SourceFile::parse(
-            "use crate::foo; const C: <()>::Item = ( true && true , true || true , 1 != 1, 2 == 2, 3 < 3, 4 <= 4, 5 > 5, 6 >= 6, !true, *p, &p , &mut p, async { let _ @ [] })\n;\n\nunsafe impl A for B where: {}",
+            "use crate::foo; const C: <()>::Item = ( true && true , true || true , 1 != 1, 2 == 2, 3 < 3, 4 <= 4, 5 > 5, 6 >= 6, !true, *p, &p , &mut p, async { let _ @ [] }, while loop {} {})\n;\n\nunsafe impl A for B where: {}",
             Edition::CURRENT,
         )
     });