maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Reduce penalty for splitting after "{" in static initializers. 

This fixes llvm.org/PR15379.

Before:
const uint8_t aaaaaaaaaaaaaaaaaaaaaa[0] = { 0x00, 0x00, 0x00, 0x00, 0x00,
                                            0x00,                  // comment
                                            0x00, 0x00, 0x00, 0x00, 0x00,
                                            0x00,                  // comment
                                            0x00, 0x00, 0x00, 0x00 // comment
};

After:
const uint8_t aaaaaaaaaaaaaaaaaaaaaa[0] = {
  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // comment
  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // comment
  0x00, 0x00, 0x00, 0x00              // comment
};

llvm-svn: 176262
This commit is contained in:
Daniel Jasper 2013-02-28 15:04:12 +00:00
parent ce17020c97
commit a400cab43a
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -880,8 +880,6 @@ unsigned TokenAnnotator::splitPenalty(const AnnotatedLine &Line,
else else
return 100; return 100;
} }
if (Left.is(tok::l_brace) && Right.isNot(tok::l_brace))
return 50;
if (Left.is(tok::equal) && Right.is(tok::l_brace)) if (Left.is(tok::equal) && Right.is(tok::l_brace))
return 150; return 150;
if (Left.is(tok::coloncolon)) if (Left.is(tok::coloncolon))
@ -917,7 +915,7 @@ unsigned TokenAnnotator::splitPenalty(const AnnotatedLine &Line,
return 20; return 20;
if (Left.is(tok::l_paren) || Left.is(tok::l_square) || if (Left.is(tok::l_paren) || Left.is(tok::l_square) ||
Left.Type == TT_TemplateOpener) Left.is(tok::l_brace) || Left.Type == TT_TemplateOpener)
return 20; return 20;
if (Right.is(tok::lessless)) { if (Right.is(tok::lessless)) {

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

@ -612,6 +612,11 @@ TEST_F(FormatTest, CommentsInStaticInitializers) {
"\n" "\n"
" b\n" " b\n"
"};")); "};"));
verifyFormat("const uint8_t aaaaaaaaaaaaaaaaaaaaaa[0] = {\n"
" 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // comment\n"
" 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // comment\n"
" 0x00, 0x00, 0x00, 0x00 // comment\n"
"};");
} }
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//