replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

clang-format: Fix spacing in Cpp11 braced lists: 

Before:
  vector<int> foo{ ::SomeFunction()};

After:
  vector<int> foo{::SomeFunction()};

llvm-svn: 198769
This commit is contained in:
Daniel Jasper 2014-01-08 15:41:13 +00:00
parent 95c864d9bd
commit 7620b6628b
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/lib/Format/TokenAnnotator.cpp
View File

@ -1278,7 +1278,7 @@ bool TokenAnnotator::spaceRequiredBetween(const AnnotatedLine &Line,
return false;
if (Left.is(tok::coloncolon))
return false;
if (Right.is(tok::coloncolon))
if (Right.is(tok::coloncolon) && Left.isNot(tok::l_brace))
return (Left.is(tok::less) && Style.Standard == FormatStyle::LS_Cpp03) ||
!Left.isOneOf(tok::identifier, tok::greater, tok::l_paren,
tok::r_paren, tok::less);

2
clang/unittests/Format/FormatTest.cpp
View File

@ -4826,6 +4826,7 @@ TEST_F(FormatTest, LayoutCxx11ConstructorBraceInitializers) {
" aaaaaaaaaaaa, aaaaaaaaaaaaaaaaaaa + aaaaaaaaaaaaaaaaaaa,\n"
" aaaaaaa, a\n"
"};");
verifyFormat("vector<int> foo = { ::SomeGlobalFunction() };");
FormatStyle NoSpaces = getLLVMStyle();
NoSpaces.Cpp11BracedListStyle = true;
@ -4846,6 +4847,7 @@ TEST_F(FormatTest, LayoutCxx11ConstructorBraceInitializers) {
" T member = {arg1, arg2};\n"
"};",
NoSpaces);
verifyFormat("vector<int> foo = {::SomeGlobalFunction()};", NoSpaces);
// FIXME: The alignment of these trailing comments might be bad. Then again,
// this might be utterly useless in real code.