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

[clang-format] Break template declarations followed by comments 

Summary:
This patch fixes two bugs in clang-format where the template wrapper doesn't skip over
comments causing a long template declaration to not be split into multiple lines.
These were latent and exposed by r332436.

Reviewers: sammccall

Reviewed By: sammccall

Subscribers: klimek, cfe-commits

Differential Revision: https://reviews.llvm.org/D47257

llvm-svn: 333085
This commit is contained in:
Krasimir Georgiev 2018-05-23 14:18:19 +00:00
parent 5c4fb4566d
commit 0fb19de0c3
2 changed files with 55 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
clang/lib/Format/ContinuationIndenter.cpp
View File

@ -405,7 +405,7 @@ bool ContinuationIndenter::mustBreak(const LineState &State) {
// If the template declaration spans multiple lines, force wrap before the
// function/class declaration
if (Previous.ClosesTemplateDeclaration &&
State.Stack.back().BreakBeforeParameter)
State.Stack.back().BreakBeforeParameter && Current.CanBreakBefore)
return true;
if (State.Column <= NewLineColumn)
@ -804,7 +804,8 @@ unsigned ContinuationIndenter::addTokenOnNewLine(LineState &State,
!State.Stack.back().AvoidBinPacking) ||
Previous.is(TT_BinaryOperator))
State.Stack.back().BreakBeforeParameter = false;
if (Previous.isOneOf(TT_TemplateCloser, TT_JavaAnnotation) &&
if (PreviousNonComment &&
PreviousNonComment->isOneOf(TT_TemplateCloser, TT_JavaAnnotation) &&
Current.NestingLevel == 0)
State.Stack.back().BreakBeforeParameter = false;
if (NextNonComment->is(tok::question) ||

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

@ -5521,6 +5521,58 @@ TEST_F(FormatTest, WrapsTemplateDeclarations) {
NeverBreak);
}
TEST_F(FormatTest, WrapsTemplateDeclarationsWithComments) {
FormatStyle Style = getGoogleStyle(FormatStyle::LK_Cpp);
Style.ColumnLimit = 60;
EXPECT_EQ(R"test(
// Baseline - no comments.
template <
typename aaaaaaaaaaaaaaaaaaaaaa<bbbbbbbbbbbb>::value>
void f() {})test",
format(R"test(
// Baseline - no comments.
template <
typename aaaaaaaaaaaaaaaaaaaaaa<bbbbbbbbbbbb>::value>
void f() {})test", Style));
EXPECT_EQ(R"test(
template <
typename aaaaaaaaaa<bbbbbbbbbbbb>::value> // trailing
void f() {})test",
format(R"test(
template <
typename aaaaaaaaaa<bbbbbbbbbbbb>::value> // trailing
void f() {})test", Style));
EXPECT_EQ(R"test(
template <
typename aaaaaaaaaa<bbbbbbbbbbbb>::value> /* line */
void f() {})test",
format(R"test(
template <typename aaaaaaaaaa<bbbbbbbbbbbb>::value> /* line */
void f() {})test", Style));
EXPECT_EQ(R"test(
template <
typename aaaaaaaaaa<bbbbbbbbbbbb>::value> // trailing
// multiline
void f() {})test",
format(R"test(
template <
typename aaaaaaaaaa<bbbbbbbbbbbb>::value> // trailing
// multiline
void f() {})test", Style));
EXPECT_EQ(R"test(
template <typename aaaaaaaaaa<
bbbbbbbbbbbb>::value> // trailing loooong
void f() {})test",
format(R"test(
template <
typename aaaaaaaaaa<bbbbbbbbbbbb>::value> // trailing loooong
void f() {})test", Style));
}
TEST_F(FormatTest, WrapsTemplateParameters) {
FormatStyle Style = getLLVMStyle();
Style.AlignAfterOpenBracket = FormatStyle::BAS_DontAlign;