diff options
| author | Daniel Jasper <djasper@google.com> | 2013-02-28 15:04:12 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2013-02-28 15:04:12 +0000 |
| commit | 25e81b255cea00fe633f2822c1d1d708ef871a59 (patch) | |
| tree | 68059398682e9b34cf90e9f09e44aa845b3ab6c8 | |
| parent | 8ed4100410ea055a03be5ec4a92a947a0ee664cd (diff) | |
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
};
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@176262 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Format/TokenAnnotator.cpp | 4 | ||||
| -rw-r--r-- | unittests/Format/FormatTest.cpp | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/lib/Format/TokenAnnotator.cpp b/lib/Format/TokenAnnotator.cpp index e127f4af8e..b9e35126ec 100644 --- a/lib/Format/TokenAnnotator.cpp +++ b/lib/Format/TokenAnnotator.cpp @@ -880,8 +880,6 @@ unsigned TokenAnnotator::splitPenalty(const AnnotatedLine &Line, else 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)) return 150; if (Left.is(tok::coloncolon)) @@ -917,7 +915,7 @@ unsigned TokenAnnotator::splitPenalty(const AnnotatedLine &Line, return 20; 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; if (Right.is(tok::lessless)) { diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp index 392548dc6c..baeb0143bc 100644 --- a/unittests/Format/FormatTest.cpp +++ b/unittests/Format/FormatTest.cpp @@ -612,6 +612,11 @@ TEST_F(FormatTest, CommentsInStaticInitializers) { "\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" + "};"); } //===----------------------------------------------------------------------===// |