[PATCH] D42298: [clang-format] Fix shortening blocks in macros causing merged next line

2018-01-19 Thread Krasimir Georgiev via Phabricator via cfe-commits
This revision was automatically updated to reflect the committed changes. Closed by commit rL322954: [clang-format] Fix shortening blocks in macros causing merged next line (authored by krasimir, committed by ). Herald added a subscriber: llvm-commits. Repository: rL LLVM

[PATCH] D42298: [clang-format] Fix shortening blocks in macros causing merged next line

2018-01-19 Thread Benjamin Kramer via Phabricator via cfe-commits
bkramer accepted this revision. bkramer added a comment. This revision is now accepted and ready to land. lgtm Comment at: lib/Format/UnwrappedLineFormatter.cpp:310 +MergedLines = tryMergeSimpleBlock(I - 1, E, Limit); +// If we managed to merge the block,

[PATCH] D42298: [clang-format] Fix shortening blocks in macros causing merged next line

2018-01-19 Thread Krasimir Georgiev via Phabricator via cfe-commits
krasimir updated this revision to Diff 130609. krasimir added a comment. - Remove double whitespace Repository: rC Clang https://reviews.llvm.org/D42298 Files: lib/Format/UnwrappedLineFormatter.cpp unittests/Format/FormatTest.cpp Index: unittests/Format/FormatTest.cpp

[PATCH] D42298: [clang-format] Fix shortening blocks in macros causing merged next line

2018-01-19 Thread Krasimir Georgiev via Phabricator via cfe-commits
krasimir updated this revision to Diff 130604. krasimir added a comment. - Remove added newline Repository: rC Clang https://reviews.llvm.org/D42298 Files: lib/Format/UnwrappedLineFormatter.cpp unittests/Format/FormatTest.cpp Index: unittests/Format/FormatTest.cpp

[PATCH] D42298: [clang-format] Fix shortening blocks in macros causing merged next line

2018-01-19 Thread Krasimir Georgiev via Phabricator via cfe-commits
krasimir created this revision. krasimir added a reviewer: bkramer. Herald added a subscriber: klimek. This patch addresses bug 36002, where a combination of options causes the line following a short block in macro to be merged with that macro. Repository: rC Clang