[clang-format] Fixed missing space between Obj-C for/in and a typecast

[ksuther]

Summary

Fixes this bug: https://llvm.org/bugs/show_bug.cgi?id=24504

TokenAnnotator::spaceRequiredBetween was handling TT_ForEachMacro but not TT_ObjCForIn, so lines that look like:

for (id nextObject in (NSArray *)myArray)

would incorrectly turn into:

for (id nextObject in(NSArray *)myArray)

[ksuther]

This is my first commit and I'm trying to figure out the system, hope I'm doing this right.

[klimek]

In the future, please add cfe-commits as subscriber on the initial post, otherwise the initial email will not go to the mailing list. Thx!

[klimek]

Oh, and you'll want to add tests :) unittests/Format/FormatTest.cpp

[ksuther]

Added two tests: One of a for/in loop with a cast, and one without.

[ksuther]

Adding another comment in hopes of getting some visibility on this. Do I need to add other people as reviewers?

[djasper]

Looks good. Do you have commit access?

[ksuther]

I don't, this and http://reviews.llvm.org/D12489 are my first patch submissions.

[djasper]

Submitted as r249553. Sorry for the delay.

lib/Format/TokenAnnotator.cpp

     if (Left.is(tok::r_paren) && Left.is(TT_AttributeParen))
       return true;
     return Line.Type == LT_ObjCDecl || Left.is(tok::semi) ||
            (Style.SpaceBeforeParens != FormatStyle::SBPO_Never &&
             (Left.isOneOf(tok::kw_if, tok::pp_elif, tok::kw_for, tok::kw_while,
-                          tok::kw_switch, tok::kw_case, TT_ForEachMacro) ||
+                          tok::kw_switch, tok::kw_case, TT_ForEachMacro,
+                          TT_ObjCForIn) ||
              (Left.isOneOf(tok::kw_try, Keywords.kw___except, tok::kw_catch,
                            tok::kw_new, tok::kw_delete) &&
               (!Left.Previous || Left.Previous->isNot(tok::period))))) ||
            (Style.SpaceBeforeParens == FormatStyle::SBPO_Always &&
             (Left.is(tok::identifier) || Left.isFunctionLikeKeyword() ||

unittests/Format/FormatTest.cpp

 
   verifyFormat("@import foo.bar;\n"
                "@import baz;");
 }
 
+TEST_F(FormatTest, ObjCForIn) {
+  verifyFormat("- (void)test {\n"
+               "  for (NSString *n in arrayOfStrings) {\n"
+               "    foo(n);\n"
+               "  }\n"
+               "}");
+  verifyFormat("- (void)test {\n"
+               "  for (NSString *n in (__bridge NSArray *)arrayOfStrings) {\n"
+               "    foo(n);\n"
+               "  }\n"
+               "}");
+}
+
 TEST_F(FormatTest, ObjCLiterals) {
   verifyFormat("@\"String\"");
   verifyFormat("@1");
   verifyFormat("@+4.8");
   verifyFormat("@-4");