From a8a0b236b5768ab30a0439872368c1dc2e199860 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Kohlgr=C3=BCber?= <felix.kohlgrueber@gmail.com>
Date: Thu, 6 Dec 2018 11:07:10 +0100
Subject: [PATCH] fix #3482 and add ui test for it

---
 clippy_lints/src/block_in_if_condition.rs | 2 +-
 tests/ui/block_in_if_condition.rs         | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/clippy_lints/src/block_in_if_condition.rs b/clippy_lints/src/block_in_if_condition.rs
index 5597b856a..f90e7669d 100644
--- a/clippy_lints/src/block_in_if_condition.rs
+++ b/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 --git a/tests/ui/block_in_if_condition.rs b/tests/ui/block_in_if_condition.rs
index bb87315bc..946118118 100644
--- a/tests/ui/block_in_if_condition.rs
+++ b/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!()
+    }
+}