From d89a6c24f5ff22e2b429243ac47530f2e7914afe Mon Sep 17 00:00:00 2001 From: Daniel Jasper Date: Fri, 10 Jan 2014 07:44:53 +0000 Subject: [PATCH] clang-format: Understand ObjC boxed expressions. Before: [dictionary setObject:@(1)forKey:@"number"]; After: [dictionary setObject:@(1) forKey:@"number"]; git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@198920 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Format/TokenAnnotator.cpp | 1 + unittests/Format/FormatTest.cpp | 2 ++ 2 files changed, 3 insertions(+) diff --git a/lib/Format/TokenAnnotator.cpp b/lib/Format/TokenAnnotator.cpp index 1268be29b3..5799ae21af 100644 --- a/lib/Format/TokenAnnotator.cpp +++ b/lib/Format/TokenAnnotator.cpp @@ -717,6 +717,7 @@ private: if (LeftOfParens && (LeftOfParens->Tok.getIdentifierInfo() == NULL || LeftOfParens->is(tok::kw_return)) && LeftOfParens->Type != TT_OverloadedOperator && + LeftOfParens->isNot(tok::at) && LeftOfParens->Type != TT_TemplateCloser && Current.Next && Current.Next->is(tok::identifier)) IsCast = true; diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp index c66dd9819b..311a0460a8 100644 --- a/unittests/Format/FormatTest.cpp +++ b/unittests/Format/FormatTest.cpp @@ -5879,6 +5879,8 @@ TEST_F(FormatTest, ObjCLiterals) { verifyFormat("NSNumber *piOverTwo = @(M_PI / 2);"); verifyFormat("NSNumber *favoriteColor = @(Green);"); verifyFormat("NSString *path = @(getenv(\"PATH\"));"); + + verifyFormat("[dictionary setObject:@(1) forKey:@\"number\"];"); } TEST_F(FormatTest, ObjCDictLiterals) { -- 2.50.0