diff options
| author | Daniel Jasper <djasper@google.com> | 2015-07-15 16:26:47 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2015-07-15 16:26:47 +0000 |
| commit | bfbaed9ca73cba98737766f0145ffd8c7838895b (patch) | |
| tree | 8c9165cc99078f6ac3823d8fde16293085a2e433 /lib/Format/FormatToken.cpp | |
| parent | 83bcf1c6654c6a2b4ee3fcccd4ac6668f87a11d5 (diff) | |
clang-format: Fix column layout with a comment in the last line.
Before:
int aaaaa[] = {
1, 2,
3, // comment
4, 5,
6 // comment
};
After:
int aaaaa[] = {
1, 2, 3, // comment
4, 5, 6 // comment
};
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@242299 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Format/FormatToken.cpp')
| -rw-r--r-- | lib/Format/FormatToken.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/Format/FormatToken.cpp b/lib/Format/FormatToken.cpp index 6c244c3166..358a9a48ec 100644 --- a/lib/Format/FormatToken.cpp +++ b/lib/Format/FormatToken.cpp @@ -183,7 +183,8 @@ void CommaSeparatedList::precomputeFormattingInfos(const FormatToken *Token) { ItemEnd = Token->MatchingParen; const FormatToken *NonCommentEnd = ItemEnd->getPreviousNonComment(); ItemLengths.push_back(CodePointsBetween(ItemBegin, NonCommentEnd)); - if (Style.Cpp11BracedListStyle) { + if (Style.Cpp11BracedListStyle && + !ItemEnd->Previous->isTrailingComment()) { // In Cpp11 braced list style, the } and possibly other subsequent // tokens will need to stay on a line with the last element. while (ItemEnd->Next && !ItemEnd->Next->CanBreakBefore) |