[clang-format] Don't allow newline after uppercase Obj-C block return types

[ksuther]

Summary

Fixes the following:

BOOL (^aaa)(void) = ^BOOL {
};

The first BOOL's token was getting set to TT_FunctionAnnotationRParen incorrectly, which was causing an unexpected newline after (^aaa). This was introduced in r245846.

[ksuther]

This patch got buried, giving it a bump to see if anyone can take a look at it.

[djasper]

Sorry for the delayed reply. I think this looks good.

[ksuther]

Thank you! I don't have commit access, so could this be committed by someone who does?

[ksuther]

This was accepted a few months ago but it got buried and was never committed. The diff has been updated so that it can be committed cleanly.

[Eugene.Zelenko]

Looks like patch was not committed.

[djasper]

Ah, sorry for dropping this on the floor :(.

May I nonetheless ask you to add a test (unittests/Format/FormatTest.cpp)?

[ksuther]

Added a unit test.

[djasper]

Committed as r282448.

lib/Format/TokenAnnotator.cpp

           !Current.Next->isBinaryOperator() &&
           !Current.Next->isOneOf(tok::semi, tok::colon, tok::l_brace,
                                  tok::period, tok::arrow, tok::coloncolon))
-        if (FormatToken *BeforeParen = Current.MatchingParen->Previous)
-          if (BeforeParen->is(tok::identifier) &&
-              BeforeParen->TokenText == BeforeParen->TokenText.upper() &&
-              (!BeforeParen->Previous ||
-               BeforeParen->Previous->ClosesTemplateDeclaration))
-            Current.Type = TT_FunctionAnnotationRParen;
+        if (FormatToken *AfterParen = Current.MatchingParen->Next) {
+          // Make sure this isn't the return type of an Obj-C block declaration
+          if (AfterParen->Tok.isNot(tok::caret)) {
+            if (FormatToken *BeforeParen = Current.MatchingParen->Previous)
+              if (BeforeParen->is(tok::identifier) &&
+                  BeforeParen->TokenText == BeforeParen->TokenText.upper() &&
+                  (!BeforeParen->Previous ||
+                   BeforeParen->Previous->ClosesTemplateDeclaration))
+                Current.Type = TT_FunctionAnnotationRParen;
+          }
+    }
     } else if (Current.is(tok::at) && Current.Next) {
       if (Current.Next->isStringLiteral()) {
         Current.Type = TT_ObjCStringLiteral;

unittests/Format/FormatTest.cpp

                "  }\n"
                "});");
   verifyFormat("Block b = ^int *(A *a, B *b) {}");
+  verifyFormat("BOOL (^aaa)(void) = ^BOOL {\n"
+               "};");
 
   FormatStyle FourIndent = getLLVMStyle();
   FourIndent.ObjCBlockIndentWidth = 4;