fix: semicolon_outside_block suggests wrongly when inside macros

Author: profetia

clippy_lints/src/semicolon_block.rs

@@ -121,6 +121,11 @@ impl SemicolonBlock {
             return;
         }
 
+        // If the block is from a macro input, we don't want to suggest moving the semicolon
+        if is_from_macro_input(cx, block) {
+            return;
+        }
+
         span_lint_and_then(
             cx,
             SEMICOLON_OUTSIDE_BLOCK,
@@ -179,3 +184,13 @@ fn get_line(cx: &LateContext<'_>, span: Span) -> Option<usize> {
 
     None
 }
+
+fn is_from_macro_input(cx: &LateContext<'_>, block: &Block<'_>) -> bool {
+    if block.span.from_expansion() {
+        return false;
+    }
+
+    let this = block.span;
+    let parent = cx.tcx.hir_span(cx.tcx.parent_hir_id(block.hir_id));
+    !parent.contains(this) && parent.source_callsite().contains(this)
+}

tests/ui/semicolon_outside_block.fixed

@@ -96,3 +96,28 @@ fn main() {
 
     unit_fn_block()
 }
+
+fn issue14926() {
+    macro_rules! gen_code {
+        [$l:lifetime: $b:block, $b2: block $(,)?] => {
+            $l: loop {
+                $b
+                break $l;
+            }
+            $l: loop {
+                $b2
+                break $l;
+            }
+        };
+    }
+
+    gen_code! {
+        'root:
+        {
+            println!("Block1");
+        },
+        {
+            println!("Block2");
+        },
+    }
+}

tests/ui/semicolon_outside_block.rs

@@ -96,3 +96,28 @@ fn main() {
 
     unit_fn_block()
 }
+
+fn issue14926() {
+    macro_rules! gen_code {
+        [$l:lifetime: $b:block, $b2: block $(,)?] => {
+            $l: loop {
+                $b
+                break $l;
+            }
+            $l: loop {
+                $b2
+                break $l;
+            }
+        };
+    }
+
+    gen_code! {
+        'root:
+        {
+            println!("Block1");
+        },
+        {
+            println!("Block2");
+        },
+    }
+}