Merge pull request #3496 from fkohlgrueber/macro-in-closure-in-if-cond

fix #3482 and add ui test for it

Author: oli-obk

Diff for: clippy_lints/src/block_in_if_condition.rs

@@ -70,7 +70,7 @@ impl<'a, 'tcx: 'a> Visitor<'tcx> for ExVisitor<'a, 'tcx> {
         if let ExprKind::Closure(_, _, eid, _, _) = expr.node {
             let body = self.cx.tcx.hir.body(eid);
             let ex = &body.value;
-            if matches!(ex.node, ExprKind::Block(_, _)) {
+            if matches!(ex.node, ExprKind::Block(_, _)) && !in_macro(body.value.span) {
                 self.found_block = Some(ex);
                 return;
             }

Diff for: tests/ui/block_in_if_condition.rs

@@ -98,3 +98,11 @@ fn condition_is_unsafe_block() {
 
 fn main() {
 }
+
+fn macro_in_closure() {
+    let option = Some(true);
+
+    if option.unwrap_or_else(|| unimplemented!()) {
+        unimplemented!()
+    }
+}