Format patches

Author: etcwilde

lib/Sema/TypeCheckAttr.cpp

@@ -486,30 +486,34 @@ static void emitFixItIBActionRemoveAsync(ASTContext &ctx, const FuncDecl &FD) {
   std::string replacement = "";
 
   // attributes, function name and everything up to `async` (exclusive)
-  replacement += CharSourceRange(ctx.SourceMgr,
-      FD.getSourceRangeIncludingAttrs().Start,
-      FD.getAsyncLoc()).str();
-
-  CharSourceRange returnType = Lexer::getCharSourceRangeFromSourceRange(ctx.SourceMgr,
-      FD.getResultTypeSourceRange());
+  replacement +=
+      CharSourceRange(ctx.SourceMgr, FD.getSourceRangeIncludingAttrs().Start,
+                      FD.getAsyncLoc())
+          .str();
 
+  CharSourceRange returnType = Lexer::getCharSourceRangeFromSourceRange(
+      ctx.SourceMgr, FD.getResultTypeSourceRange());
 
   // If we have a return type, include that here
   if (returnType.isValid()) {
-    replacement += (llvm::Twine("-> ") + Lexer::getCharSourceRangeFromSourceRange(ctx.SourceMgr,
-          FD.getResultTypeSourceRange()).str()).str();
+    replacement +=
+        (llvm::Twine("-> ") + Lexer::getCharSourceRangeFromSourceRange(
+                                  ctx.SourceMgr, FD.getResultTypeSourceRange())
+                                  .str())
+            .str();
   }
 
-
   if (!FD.hasBody()) {
     // If we don't have any body, the sourcelocs won't work and will result in
     // crashes, so just swap out what we can
 
-    SourceLoc endLoc = returnType.isValid() ? returnType.getEnd() : FD.getAsyncLoc();
-    ctx.Diags.diagnose(FD.getAsyncLoc(), diag::remove_async_add_task,
-        FD.getName())
-      .fixItReplace(SourceRange(FD.getSourceRangeIncludingAttrs().Start, endLoc),
-          replacement);
+    SourceLoc endLoc =
+        returnType.isValid() ? returnType.getEnd() : FD.getAsyncLoc();
+    ctx.Diags
+        .diagnose(FD.getAsyncLoc(), diag::remove_async_add_task, FD.getName())
+        .fixItReplace(
+            SourceRange(FD.getSourceRangeIncludingAttrs().Start, endLoc),
+            replacement);
     return;
   }
 
@@ -523,18 +527,21 @@ static void emitFixItIBActionRemoveAsync(ASTContext &ctx, const FuncDecl &FD) {
   // location of the source range to come after the `End` of the range, and we
   // will overflow. Dance around this by just appending the end of the fix to
   // the replacement.
-  if (FD.getBody()->getLBraceLoc() != FD.getBody()->getRBraceLoc().getAdvancedLocOrInvalid(-1)) {
+  if (FD.getBody()->getLBraceLoc() !=
+      FD.getBody()->getRBraceLoc().getAdvancedLocOrInvalid(-1)) {
     // We actually have a body, so add that to the string
-    CharSourceRange functionBody(ctx.SourceMgr,
-        FD.getBody()->getLBraceLoc().getAdvancedLocOrInvalid(1),
+    CharSourceRange functionBody(
+        ctx.SourceMgr, FD.getBody()->getLBraceLoc().getAdvancedLocOrInvalid(1),
         FD.getBody()->getRBraceLoc().getAdvancedLocOrInvalid(-1));
     replacement += functionBody.str();
   }
   replacement += " }\n}";
 
-  ctx.Diags.diagnose(FD.getAsyncLoc(), diag::remove_async_add_task, FD.getName())
-    .fixItReplace(SourceRange(FD.getSourceRangeIncludingAttrs().Start,
-          FD.getBody()->getRBraceLoc()), replacement);
+  ctx.Diags
+      .diagnose(FD.getAsyncLoc(), diag::remove_async_add_task, FD.getName())
+      .fixItReplace(SourceRange(FD.getSourceRangeIncludingAttrs().Start,
+                                FD.getBody()->getRBraceLoc()),
+                    replacement);
 }
 
 static bool
@@ -565,7 +572,7 @@ validateIBActionSignature(ASTContext &ctx, DeclAttribute *attr,
 
   if (FD->isAsyncContext()) {
     ctx.Diags.diagnose(FD->getAsyncLoc(), diag::attr_decl_async,
-        attr->getAttrName(), FD->getDescriptiveKind());
+                       attr->getAttrName(), FD->getDescriptiveKind());
     emitFixItIBActionRemoveAsync(ctx, *FD);
     valid = false;
   }

lib/Sema/TypeCheckDeclPrimary.cpp

@@ -2972,10 +2972,9 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
       if (isRepresentableInObjC(FD, reason, asyncConvention, errorConvention)) {
         if (FD->hasAsync()) {
           FD->setForeignAsyncConvention(*asyncConvention);
-          getASTContext().Diags.diagnose(CDeclAttr->getLocation(),
-                                         diag::attr_decl_async,
-                                         CDeclAttr->getAttrName(),
-                                         FD->getDescriptiveKind());
+          getASTContext().Diags.diagnose(
+              CDeclAttr->getLocation(), diag::attr_decl_async,
+              CDeclAttr->getAttrName(), FD->getDescriptiveKind());
         } else if (FD->hasThrows()) {
           FD->setForeignErrorConvention(*errorConvention);
           getASTContext().Diags.diagnose(CDeclAttr->getLocation(),