Merge #7812

7812: Use consistent naming for assist r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <[email protected]>

2 files changed, 30 insertions, 10 deletions

diff --git a/crates/ide_assists/src/handlers/convert_for_to_iter_for_each.rs b/crates/ide_assists/src/handlers/replace_for_loop_with_for_each.rs
index 9fddf889c..27da28bc0 100644
--- a/crates/ide_assists/src/handlers/convert_for_to_iter_for_each.rs
+++ b/crates/ide_assists/src/handlers/replace_for_loop_with_for_each.rs
@@ -3,17 +3,18 @@ use hir::known;
 use ide_db::helpers::FamousDefs;
 use stdx::format_to;
 use syntax::{ast, AstNode};
+use test_utils::mark;
 
 use crate::{AssistContext, AssistId, AssistKind, Assists};
 
-// Assist: convert_for_to_iter_for_each
+// Assist: replace_for_loop_with_for_each
 //
 // Converts a for loop into a for_each loop on the Iterator.
 //
 // ```
 // fn main() {
 //     let x = vec![1, 2, 3];
-//     for $0v in x {
+//     for$0 v in x {
 //         let y = v * 2;
 //     }
 // }
@@ -27,15 +28,19 @@ use crate::{AssistContext, AssistId, AssistKind, Assists};
 //     });
 // }
 // ```
-pub(crate) fn convert_for_to_iter_for_each(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
+pub(crate) fn replace_for_loop_with_for_each(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
     let for_loop = ctx.find_node_at_offset::<ast::ForExpr>()?;
     let iterable = for_loop.iterable()?;
     let pat = for_loop.pat()?;
     let body = for_loop.loop_body()?;
+    if body.syntax().text_range().start() < ctx.offset() {
+        mark::hit!(not_available_in_body);
+        return None;
+    }
 
     acc.add(
-        AssistId("convert_for_to_iter_for_each", AssistKind::RefactorRewrite),
-        "Convert a for loop into an Iterator::for_each",
+        AssistId("replace_for_loop_with_for_each", AssistKind::RefactorRewrite),
+        "Replace this for loop with `Iterator::for_each`",
         for_loop.syntax().text_range(),
         |builder| {
             let mut buf = String::new();
@@ -145,13 +150,13 @@ pub struct NoIterMethod;
             FamousDefs::FIXTURE,
             EMPTY_ITER_FIXTURE
         );
-        check_assist(convert_for_to_iter_for_each, before, after);
+        check_assist(replace_for_loop_with_for_each, before, after);
     }
 
     #[test]
     fn test_not_for() {
         check_assist_not_applicable(
-            convert_for_to_iter_for_each,
+            replace_for_loop_with_for_each,
             r"
 let mut x = vec![1, 2, 3];
 x.iter_mut().$0for_each(|v| *v *= 2);
@@ -162,7 +167,7 @@ x.iter_mut().$0for_each(|v| *v *= 2);
     #[test]
     fn test_simple_for() {
         check_assist(
-            convert_for_to_iter_for_each,
+            replace_for_loop_with_for_each,
             r"
 fn main() {
     let x = vec![1, 2, 3];
@@ -181,6 +186,21 @@ fn main() {
     }
 
     #[test]
+    fn not_available_in_body() {
+        mark::check!(not_available_in_body);
+        check_assist_not_applicable(
+            replace_for_loop_with_for_each,
+            r"
+fn main() {
+    let x = vec![1, 2, 3];
+    for v in x {
+        $0v *= 2;
+    }
+}",
+        )
+    }
+
+    #[test]
     fn test_for_borrowed() {
         check_assist_with_fixtures(
             r"
@@ -255,7 +275,7 @@ fn main() {
     #[test]
     fn test_for_borrowed_mut_behind_var() {
         check_assist(
-            convert_for_to_iter_for_each,
+            replace_for_loop_with_for_each,
             r"
 fn main() {
     let x = vec![1, 2, 3];
diff --git a/crates/ide_assists/src/handlers/replace_let_with_if_let.rs b/crates/ide_assists/src/handlers/replace_let_with_if_let.rs
index 5a27ada6b..be7e724b5 100644
--- a/crates/ide_assists/src/handlers/replace_let_with_if_let.rs
+++ b/crates/ide_assists/src/handlers/replace_let_with_if_let.rs
@@ -1,5 +1,6 @@
 use std::iter::once;
 
+use ide_db::ty_filter::TryEnum;
 use syntax::{
     ast::{
         self,
@@ -10,7 +11,6 @@ use syntax::{
 };
 
 use crate::{AssistContext, AssistId, AssistKind, Assists};
-use ide_db::ty_filter::TryEnum;
 
 // Assist: replace_let_with_if_let
 //