Fix "*" formatting when creating arrays of pointers.
Before: A = new int * [10]();
After: A = new int *[10]();
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@173150 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp
index 05c96bd..e9ff3c9 100644
--- a/lib/Format/Format.cpp
+++ b/lib/Format/Format.cpp
@@ -958,6 +958,13 @@
while (CurrentToken != NULL) {
if (CurrentToken->is(tok::r_square)) {
+ if (!CurrentToken->Children.empty() &&
+ CurrentToken->Children[0].is(tok::l_paren)) {
+ // An ObjC method call can't be followed by an open parenthesis.
+ // FIXME: Do we incorrectly label ":" with this?
+ StartsObjCMethodExpr = false;
+ Left->Type = TT_Unknown;
+ }
if (StartsObjCMethodExpr)
objCSelector.markEnd(*CurrentToken);
Left->MatchingParen = CurrentToken;
@@ -1325,6 +1332,9 @@
if (NextToken == NULL)
return TT_Unknown;
+ if (NextToken->is(tok::l_square) && NextToken->Type != TT_ObjCMethodExpr)
+ return TT_PointerOrReference;
+
if (PrevToken->is(tok::l_paren) || PrevToken->is(tok::l_square) ||
PrevToken->is(tok::l_brace) || PrevToken->is(tok::comma) ||
PrevToken->is(tok::kw_return) || PrevToken->is(tok::colon) ||
diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp
index ba6d751..0c6385b 100644
--- a/unittests/Format/FormatTest.cpp
+++ b/unittests/Format/FormatTest.cpp
@@ -1338,6 +1338,9 @@
verifyFormat("if (*b[i])");
verifyFormat("if (int *a = (&b))");
verifyFormat("while (int *a = &b)");
+
+ verifyFormat("A = new SomeType *[Length]();");
+ verifyGoogleFormat("A = new SomeType* [Length]();");
}
TEST_F(FormatTest, FormatsCasts) {