clang-format: Support @autoreleasepool.

[strager]

Summary

Format @autoreleasepool properly for the Attach brace style
by recognizing @autoreleasepool as a block introducer.

[thakis]

Can you add a test?

[thakis]

Oh, sorry, there is one, phab just doesn't show it (and didn't mail it)
'cause it thinks FormatTest.cpp is a binary file (?)

[djasper]

I can't see the changes to tests at the moment. Trying to fix that issue with SVN/Phabricator (it's unrelated to you patch).

[strager]

Fix test diff on Phabricator.

[strager]

Ping. Tests should be visible now.

[thakis]

The case body is mostly the same as for case tok::objc_synchronized – could they share the same code? (the paren code would just never run for autoreleasepool)

[strager]

The case body is mostly the same as for case tok::objc_synchronized – could they share the same code? (the paren code would just never run for autoreleasepool)

The same could be said for while and maybe if and for, too.

Testing @autoreleasepool (foo) { and not testing @autoreleasepool { doesn't make sense anyway.

[djasper]

lib/Format/UnwrappedLineParser.cpp

659

(I think this is also what Nico means): Join this case and the next. I think it makes sense to format "@autoreleasepool (foo) {" like @synchronized, even if it might not be valid syntax. If you care about not having parens here, extend the corresponding if-statement.

[strager]

lib/Format/UnwrappedLineParser.cpp

659

Ah, I thought Nico was talking about the test cases, not this switch.

I agree.

[strager]

Merge autoreleasepool and synchronized cases.

[thakis]

Looks good to me.

[strager]

Please merge this for me.

[thakis]

Landed in r240896.

lib/Format/UnwrappedLineParser.cpp

case tok::objc_protocol:
       return parseObjCProtocol();
     case tok::objc_end:
       return; // Handled by the caller.
     case tok::objc_optional:
     case tok::objc_required:
       nextToken();
       addUnwrappedLine();
       return;
+    case tok::objc_autoreleasepool:
     case tok::objc_synchronized:
       nextToken();
-      if (FormatTok->Tok.is(tok::l_paren))
+      if (FormatTok->Tok.is(tok::l_paren)) {
+        // @synchronized
         parseParens();
+      }
       if (FormatTok->Tok.is(tok::l_brace)) {
         if (Style.BreakBeforeBraces == FormatStyle::BS_Allman ||
             Style.BreakBeforeBraces == FormatStyle::BS_GNU)
           addUnwrappedLine();
         parseBlock(/*MustBeDeclaration=*/false);
       }
       addUnwrappedLine();
       return;

unittests/Format/FormatTest.cpp

verifyFormat("@try {\n"
                "}");
   verifyFormat("DEBUG({\n"
                "  @try {\n"
                "  } @finally {\n"
                "  }\n"
                "});\n");
 }
 
+TEST_F(FormatTest, FormatObjCAutoreleasepool) {
+  FormatStyle Style = getLLVMStyle();
+  verifyFormat("@autoreleasepool {\n"
+               "  f();\n"
+               "}\n"
+               "@autoreleasepool {\n"
+               "  f();\n"
+               "}\n",
+               Style);
+  Style.BreakBeforeBraces = FormatStyle::BS_Allman;
+  verifyFormat("@autoreleasepool\n"
+               "{\n"
+               "  f();\n"
+               "}\n"
+               "@autoreleasepool\n"
+               "{\n"
+               "  f();\n"
+               "}\n",
+               Style);
+}
+
 TEST_F(FormatTest, FormatObjCSynchronized) {
   FormatStyle Style = getLLVMStyleWithColumns(32);
   EXPECT_FALSE(Style.ObjCSpaceAfterSynchronized);
   Style.BreakBeforeBraces = FormatStyle::BS_Attach;
   Style.ObjCSpaceAfterSynchronized = false;
   verifyFormat("@synchronized(foo) {\n"
                "  f();\n"
                "}\n",