Do not suggest compatible variants inside macro

Signed-off-by: xizheyin <[email protected]>

Author: xizheyin

compiler/rustc_hir_typeck/src/fn_ctxt/suggestions.rs

@@ -2422,10 +2422,11 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                 {
                     expr = expr_
                 }
+                let expr_span = expr.span.find_oldest_ancestor_in_same_ctxt();
 
                 vec![
-                    (expr.span.shrink_to_lo(), format!("{prefix}{variant}{open}")),
-                    (expr.span.shrink_to_hi(), close.to_owned()),
+                    (expr_span.shrink_to_lo(), format!("{prefix}{variant}{open}")),
+                    (expr_span.shrink_to_hi(), close.to_owned()),
                 ]
             };
 

tests/ui/typeck/suggestions/suggest-compatible-variants-macro-issue-142359.stderr

@@ -13,6 +13,10 @@ LL | |     };
    = note:   expected enum `ControlFlow<i32, _>`
            found unit type `()`
    = note: this error originates in the macro `println` (in Nightly builds, run with -Z macro-backtrace for more info)
+help: try wrapping the expression in `std::ops::ControlFlow::Continue`
+   |
+LL |         Ok(r) => { std::ops::ControlFlow::Continue(println!("A"))}
+   |                    ++++++++++++++++++++++++++++++++             +
 
 error: aborting due to 1 previous error