maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

clang-format: Fixed missing space between Obj-C for/in and a typecast. 

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)

Patch by Kent Sutherland, thank you.

llvm-svn: 249553
This commit is contained in:
Daniel Jasper 2015-10-07 15:09:08 +00:00
parent 39828256b0
commit 9cb1ac28b9
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clang/lib/Format/TokenAnnotator.cpp
View File

@ -1902,7 +1902,8 @@ bool TokenAnnotator::spaceRequiredBetween(const AnnotatedLine &Line,
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))))) ||

13
clang/unittests/Format/FormatTest.cpp
View File

@ -7446,6 +7446,19 @@ TEST_F(FormatTest, ObjCSnippets) {
"@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");