[Macros] A macro attached to a closure body covers a range after in and up to }

The macro is not allowed to write explicit type or `in` keyword.

Author: xedin

lib/Sema/TypeCheckMacros.cpp

@@ -971,11 +971,17 @@ static CharSourceRange getExpansionInsertionRange(MacroRole role,
   }
 
   case MacroRole::Body: {
-    if (target.is<Expr *>()) {
+    if (auto *expr = target.dyn_cast<Expr *>()) {
+      ASSERT(isa<ClosureExpr>(expr));
+
+      auto *closure = cast<ClosureExpr>(expr);
       // A closure body macro expansion replaces the full source
-      // range of the closure.
+      // range of the closure body starting from `in` and ending right
+      // before the closing brace.
       return Lexer::getCharSourceRangeFromSourceRange(
-          sourceMgr, target.getSourceRange());
+          sourceMgr, SourceRange(Lexer::getLocForEndOfToken(
+                                     sourceMgr, closure->getInLoc()),
+                                 closure->getEndLoc()));
     }
 
     SourceLoc afterDeclLoc =