diff options
| -rw-r--r-- | lib/Format/Format.cpp | 2 | ||||
| -rw-r--r-- | unittests/Format/FormatTest.cpp | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp index 64a6224b0b..727e85fa4f 100644 --- a/lib/Format/Format.cpp +++ b/lib/Format/Format.cpp @@ -1149,6 +1149,8 @@ private: (Tok.is(tok::equal) || Tok.Parent->is(tok::equal))) return false; + if (Tok.Parent->is(tok::comma)) + return true; if (Tok.Type == TT_IncludePath) return Tok.is(tok::less) || Tok.is(tok::string_literal); if (Tok.Type == TT_CtorInitializerColon || Tok.Type == TT_ObjCBlockLParen) diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp index 984732571e..a46c9b685b 100644 --- a/unittests/Format/FormatTest.cpp +++ b/unittests/Format/FormatTest.cpp @@ -121,6 +121,7 @@ TEST_F(FormatTest, FormatsNestedBlockStatements) { TEST_F(FormatTest, FormatsNestedCall) { verifyFormat("Method(f1, f2(f3));"); verifyFormat("Method(f1(f2, f3()));"); + verifyFormat("Method(f1(f2, (f3())));"); } //===----------------------------------------------------------------------===// |