commit de0d61fbe8bb0ba287eeed183bb98361d4e10c68
author Daniel Jasper <djasper@google.com> Thu May 23 18:29:16 2013 +0000
committer Daniel Jasper <djasper@google.com> Thu May 23 18:29:16 2013 +0000
tree 45ad3970d5d9adb5de313d5e38930d7e1afd7c9e
parent 1bee0738b67b784f08d5e2f8351920260c9cfb1d

Increase test coverage for braced init lists.

Also fix a minor bug for constructor initializers with braced init lists.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@182601 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Format/UnwrappedLineParser.cpp

diff --git a/lib/Format/UnwrappedLineParser.cpp b/lib/Format/UnwrappedLineParser.cpp
index 081f5b9..9ef5d15 100644
--- a/lib/Format/UnwrappedLineParser.cpp
+++ b/lib/Format/UnwrappedLineParser.cpp
@@ -257,7 +257,7 @@
           // brace blocks inside it braced init list. That works good enough
           // for now, but we will need to fix it to correctly handle lambdas.
           if (NextTok.Tok.is(tok::comma) || NextTok.Tok.is(tok::semi) ||
-              NextTok.Tok.is(tok::r_paren))
+              NextTok.Tok.is(tok::r_paren) || NextTok.Tok.is(tok::l_brace))
             LBraces[LBraceStack.back()] = BS_BracedInit;
           else
             LBraces[LBraceStack.back()] = BS_Block;