Formatter: * and & are binary operators after ) and ].
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@172302 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp
index 5140639..e4dc291 100644
--- a/lib/Format/Format.cpp
+++ b/lib/Format/Format.cpp
@@ -969,7 +969,8 @@
Tok.Parent->Type == TT_CastRParen)
return TT_UnaryOperator;
- if (PrevToken.Tok.isLiteral() || NextToken.Tok.isLiteral() ||
+ if (PrevToken.Tok.isLiteral() || PrevToken.Tok.is(tok::r_paren) ||
+ PrevToken.Tok.is(tok::r_square) || NextToken.Tok.isLiteral() ||
NextToken.Tok.is(tok::plus) || NextToken.Tok.is(tok::minus) ||
NextToken.Tok.is(tok::plusplus) || NextToken.Tok.is(tok::minusminus) ||
NextToken.Tok.is(tok::tilde) || NextToken.Tok.is(tok::exclaim) ||
diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp
index 9106a1f..e5dbd63 100644
--- a/unittests/Format/FormatTest.cpp
+++ b/unittests/Format/FormatTest.cpp
@@ -1014,6 +1014,8 @@
verifyFormat("a * -b;");
verifyFormat("a * ++b;");
verifyFormat("a * --b;");
+ verifyFormat("a[4] * b;");
+ verifyFormat("f() * b;");
verifyFormat("int *pa = (int *)&a;");
verifyFormat("InvalidRegions[*R] = 0;");