Skip to content
Snippets Groups Projects
Commit 844e62bd authored by Daniel Jasper's avatar Daniel Jasper
Browse files

clang-format: Recognize braced lists with trailing function call.

Before:
  int count = set<int> { f(), g(), h() }
      .size();

After:
  int count = set<int>{f(), g(), h()}.size();

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@195417 91177308-0d34-0410-b5e6-96231b3b80d8
parent 68bf2a99
No related branches found
No related tags found
No related merge requests found
......@@ -322,7 +322,7 @@ void UnwrappedLineParser::calculateBraceTypes() {
// (for example while parsing lambdas).
//
// We exclude + and - as they can be ObjC visibility modifiers.
if (NextTok->isOneOf(tok::comma, tok::semi, tok::r_paren,
if (NextTok->isOneOf(tok::comma, tok::semi, tok::r_paren, tok::period,
tok::r_square, tok::l_brace, tok::colon) ||
(NextTok->isBinaryOperator() &&
!NextTok->isOneOf(tok::plus, tok::minus))) {
......
......@@ -4671,6 +4671,7 @@ TEST_F(FormatTest, LayoutCxx11ConstructorBraceInitializers) {
verifyFormat("new int[3]{ 1, 2, 3 };");
verifyFormat("return { arg1, arg2 };");
verifyFormat("return { arg1, SomeType{ parameter } };");
verifyFormat("int count = set<int>{ f(), g(), h() }.size();");
verifyFormat("new T{ arg1, arg2 };");
verifyFormat("f(MyMap[{ composite, key }]);");
verifyFormat("class Class {\n"
......@@ -4706,6 +4707,7 @@ TEST_F(FormatTest, LayoutCxx11ConstructorBraceInitializers) {
verifyFormat("new int[3]{1, 2, 3};", NoSpaces);
verifyFormat("return {arg1, arg2};", NoSpaces);
verifyFormat("return {arg1, SomeType{parameter}};", NoSpaces);
verifyFormat("int count = set<int>{f(), g(), h()}.size();", NoSpaces);
verifyFormat("new T{arg1, arg2};", NoSpaces);
verifyFormat("f(MyMap[{composite, key}]);", NoSpaces);
verifyFormat("class Class {\n"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment