[clang-format] Fix BraceWrapping AfterFunction for ObjC methods

[hultman]

Summary

clang-format --version
clang-format version 7.0.0 (tags/RELEASE_700/final)
echo "@implementation Foo\n- (void)foo:(id)bar\n{\n}\n@end\n" |clang-format -style='{BreakBeforeBraces: Custom, BraceWrapping: {AfterFunction: true}}'

@implementation Foo
- (void)foo:(id)bar {
}
@end

with patch:

bin/clang-format --version
clang-format version 8.0.0 (trunk 344285)
echo "@implementation Foo\n- (void)foo:(id)bar\n{\n}\n@end\n" |bin/clang-format -style='{BreakBeforeBraces: Custom, BraceWrapping: {AfterFunction: true}}'

@implementation Foo
- (void)foo:(id)bar
{
}
@end

[hultman]

This bug was introduced in revision 333553, authored by benhamilton, reviewed by jolesiak, klimek.

[benhamilton]

Thanks!

[hultman]

@benhamilton Could you land this patch?

[benhamilton]

@benhamilton Could you land this patch?

Done. Thanks for your contribution!

lib/Format/UnwrappedLineParser.cpp

void UnwrappedLineParser::parseObjCMethod() {
   assert(FormatTok->Tok.isOneOf(tok::l_paren, tok::identifier) &&
          "'(' or identifier expected.");
   do {
     if (FormatTok->Tok.is(tok::semi)) {
       nextToken();
       addUnwrappedLine();
       return;
     } else if (FormatTok->Tok.is(tok::l_brace)) {
+      if (Style.BraceWrapping.AfterFunction)
+        addUnwrappedLine();
       parseBlock(/*MustBeDeclaration=*/false);
       addUnwrappedLine();
       return;
     } else {
       nextToken();
     }
   } while (!eof());
 }

unittests/Format/FormatTestObjC.cpp

TEST_F(FormatTestObjC, FormatObjCMethodDeclarations) {
   verifyFormat("- (void)drawRectOn:(id)surface\n"
                "            ofSize:(aaaaaaaa)height\n"
                "                  :(size_t)width\n"
                "          atOrigin:(size_t)x\n"
                "                  :(size_t)y\n"
                "             aaaaa:(a)yyy\n"
                "               bbb:(d)cccc;");
   verifyFormat("- (void)drawRectOn:(id)surface ofSize:(aaa)height:(bbb)width;");
+
+  // BraceWrapping AfterFunction is respected for ObjC methods 
+  Style = getGoogleStyle(FormatStyle::LK_ObjC);
+  Style.BreakBeforeBraces = FormatStyle::BS_Custom;
+  Style.BraceWrapping.AfterFunction = true;
+  verifyFormat("@implementation Foo\n"
+               "- (void)foo:(id)bar\n"
+               "{\n"
+               "}\n"
+               "@end\n");
 }
 
 TEST_F(FormatTestObjC, FormatObjCMethodExpr) {
   verifyFormat("[foo bar:baz];");
   verifyFormat("return [foo bar:baz];");
   verifyFormat("return (a)[foo bar:baz];");
   verifyFormat("f([foo bar:baz]);");
   verifyFormat("f(2, [foo bar:baz]);");