also suggest in the multi-line case

This used to be a workaround for a rustc diagnostics issue which has
since been resolved

Author: ada4a

clippy_lints/src/methods/filter_map_next.rs

@@ -18,21 +18,15 @@ pub(super) fn check(cx: &LateContext<'_>, expr: &Expr<'_>, recv: &Expr<'_>, arg:
             expr.span,
             "called `filter_map(..).next()` on an `Iterator`",
             |diag| {
-                let sugg_msg = "use `.find_map(..)` instead";
-
                 let mut app = Applicability::MachineApplicable;
                 let filter_snippet = snippet_with_applicability(cx, arg.span, "..", &mut app);
-                if filter_snippet.lines().count() <= 1 {
-                    let iter_snippet = snippet_with_applicability(cx, recv.span, "..", &mut app);
-                    diag.span_suggestion_verbose(
-                        expr.span,
-                        sugg_msg,
-                        format!("{iter_snippet}.find_map({filter_snippet})"),
-                        app,
-                    );
-                } else {
-                    diag.help(sugg_msg);
-                }
+                let iter_snippet = snippet_with_applicability(cx, recv.span, "..", &mut app);
+                diag.span_suggestion_verbose(
+                    expr.span,
+                    "use `.find_map(..)` instead",
+                    format!("{iter_snippet}.find_map({filter_snippet})"),
+                    app,
+                );
             },
         );
     }

tests/ui/filter_map_next.fixed

@@ -6,6 +6,19 @@ fn main() {
     let element: Option<i32> = a.iter().find_map(|s| s.parse().ok());
     //~^ filter_map_next
     assert_eq!(element, Some(1));
+
+    #[rustfmt::skip]
+    let _: Option<u32> = vec![1, 2, 3, 4, 5, 6]
+        //~^ filter_map_next
+
+
+        .into_iter().find_map(|x| {
+            if x == 2 {
+                Some(x * 2)
+            } else {
+                None
+            }
+        });
 }
 
 #[clippy::msrv = "1.29"]

tests/ui/filter_map_next.rs

@@ -6,6 +6,21 @@ fn main() {
     let element: Option<i32> = a.iter().filter_map(|s| s.parse().ok()).next();
     //~^ filter_map_next
     assert_eq!(element, Some(1));
+
+    #[rustfmt::skip]
+    let _: Option<u32> = vec![1, 2, 3, 4, 5, 6]
+        //~^ filter_map_next
+
+
+        .into_iter()
+        .filter_map(|x| {
+            if x == 2 {
+                Some(x * 2)
+            } else {
+                None
+            }
+        })
+        .next();
 }
 
 #[clippy::msrv = "1.29"]

tests/ui/filter_map_next.stderr

@@ -13,7 +13,32 @@ LL +     let element: Option<i32> = a.iter().find_map(|s| s.parse().ok());
    |
 
 error: called `filter_map(..).next()` on an `Iterator`
-  --> tests/ui/filter_map_next.rs:20:26
+  --> tests/ui/filter_map_next.rs:11:26
+   |
+LL |       let _: Option<u32> = vec![1, 2, 3, 4, 5, 6]
+   |  __________________________^
+...  |
+LL | |         })
+LL | |         .next();
+   | |_______________^
+   |
+help: use `.find_map(..)` instead
+   |
+LL ~     let _: Option<u32> = vec![1, 2, 3, 4, 5, 6]
+LL +
+LL + 
+LL + 
+LL +         .into_iter().find_map(|x| {
+LL +             if x == 2 {
+LL +                 Some(x * 2)
+LL +             } else {
+LL +                 None
+LL +             }
+LL ~         });
+   |
+
+error: called `filter_map(..).next()` on an `Iterator`
+  --> tests/ui/filter_map_next.rs:35:26
    |
 LL |     let _: Option<i32> = a.iter().filter_map(|s| s.parse().ok()).next();
    |                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -24,5 +49,5 @@ LL -     let _: Option<i32> = a.iter().filter_map(|s| s.parse().ok()).next();
 LL +     let _: Option<i32> = a.iter().find_map(|s| s.parse().ok());
    |
 
-error: aborting due to 2 previous errors
+error: aborting due to 3 previous errors