diff options
| -rw-r--r-- | clang/lib/Format/ContinuationIndenter.cpp | 5 | ||||
| -rw-r--r-- | clang/unittests/Format/FormatTest.cpp | 52 |
2 files changed, 55 insertions, 2 deletions
diff --git a/clang/lib/Format/ContinuationIndenter.cpp b/clang/lib/Format/ContinuationIndenter.cpp index 441df05a52d..eacdfdc6e05 100644 --- a/clang/lib/Format/ContinuationIndenter.cpp +++ b/clang/lib/Format/ContinuationIndenter.cpp @@ -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) || diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp index 624b086a216..87e88200bb9 100644 --- a/clang/unittests/Format/FormatTest.cpp +++ b/clang/unittests/Format/FormatTest.cpp @@ -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; |
