This is an archive of the discontinued LLVM Phabricator instance.

Differential D120278

[clang-format] Don't break semi after requires clause regardless of the chosen style
ClosedPublic

Authored by HazardyKnusperkeks on Feb 21 2022, 1:12 PM.

Details

Reviewers
owenpan
MyDeveloperDay
curdeius
JohelEGP
Commits
rG923c3755ea80: [clang-format] Don't break semi after requires clause ...
Summary

Fixes https://github.com/llvm/llvm-project/issues/53818

Diff Detail

Event Timeline

HazardyKnusperkeks requested review of this revision.Feb 21 2022, 1:12 PM
HazardyKnusperkeks created this revision.
Herald added a project: Restricted Project. · View Herald TranscriptFeb 21 2022, 1:12 PM
Herald added a subscriber: cfe-commits. · View Herald Transcript
Harbormaster completed remote builds in B150751: Diff 410373.Feb 21 2022, 1:58 PM
owenpan accepted this revision.Feb 21 2022, 7:46 PM
This revision is now accepted and ready to land.Feb 21 2022, 7:46 PM
curdeius accepted this revision.Feb 21 2022, 11:06 PM
JohelEGP accepted this revision.Feb 22 2022, 4:53 AM
MyDeveloperDay accepted this revision.Feb 22 2022, 6:03 AM
This revision was landed with ongoing or failed builds.Feb 22 2022, 1:09 PM
Closed by commit rG923c3755ea80: [clang-format] Don't break semi after requires clause ... (authored by HazardyKnusperkeks). · Explain Why
This revision was automatically updated to reflect the committed changes.
HazardyKnusperkeks added a commit: rG923c3755ea80: [clang-format] Don't break semi after requires clause ....

Revision Contents

PathSize
clang/
lib/
Format/
2 lines
unittests/
Format/
10 lines

Diff 410627

clang/lib/Format/TokenAnnotator.cpp

Show First 20 Lines • Show All 3,957 Lines • ▼ Show 20 Lines if (Left.ClosesTemplateDeclaration && Left.MatchingParen &&
Left.MatchingParen->NestingLevel == 0) { Left.MatchingParen->NestingLevel == 0) {
// Put concepts on the next line e.g. // Put concepts on the next line e.g.
// template<typename T> // template<typename T>
// concept ... // concept ...
if (Right.is(tok::kw_concept)) if (Right.is(tok::kw_concept))
return Style.BreakBeforeConceptDeclarations == FormatStyle::BBCDS_Always; return Style.BreakBeforeConceptDeclarations == FormatStyle::BBCDS_Always;
return Style.AlwaysBreakTemplateDeclarations == FormatStyle::BTDS_Yes; return Style.AlwaysBreakTemplateDeclarations == FormatStyle::BTDS_Yes;
} }
if (Left.ClosesRequiresClause) { if (Left.ClosesRequiresClause && Right.isNot(tok::semi)) {
switch (Style.RequiresClausePosition) { switch (Style.RequiresClausePosition) {
case FormatStyle::RCPS_OwnLine: case FormatStyle::RCPS_OwnLine:
case FormatStyle::RCPS_WithPreceding: case FormatStyle::RCPS_WithPreceding:
return true; return true;
default: default:
break; break;
} }
} }
▲ Show 20 Lines • Show All 587 Lines • Show Last 20 Lines

clang/unittests/Format/FormatTest.cpp

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show First 20 Lines • Show All 23,855 Lines • ▼ Show 20 LinesTEST_F(FormatTest, RequiresClausesPositions) {
verifyFormat("template <typename T>\n" verifyFormat("template <typename T>\n"
"int bar(T t)\n" "int bar(T t)\n"
" requires F<T>\n" " requires F<T>\n"
"{\n" "{\n"
" return 5;\n" " return 5;\n"
"}", "}",
Style); Style);
verifyFormat("template <typename T>\n"
"int bar(T t)\n"
" requires F<T>;",
Style);
Style.IndentRequiresClause = false; Style.IndentRequiresClause = false;
verifyFormat("template <typename T>\n" verifyFormat("template <typename T>\n"
"requires F<T>\n" "requires F<T>\n"
"int bar(T t) {\n" "int bar(T t) {\n"
" return 5;\n" " return 5;\n"
"}", "}",
Style); Style);
verifyFormat("template <typename T>\n" verifyFormat("template <typename T>\n"
"int bar(T t)\n" "int bar(T t)\n"
"requires F<T>\n" "requires F<T>\n"
"{\n" "{\n"
" return 5;\n" " return 5;\n"
"}", "}",
Style); Style);
Style.RequiresClausePosition = FormatStyle::RCPS_SingleLine; Style.RequiresClausePosition = FormatStyle::RCPS_SingleLine;
verifyFormat("template <typename T> requires Foo<T> struct Bar {};\n" verifyFormat("template <typename T> requires Foo<T> struct Bar {};\n"
"template <typename T> requires Foo<T> void bar() {}\n" "template <typename T> requires Foo<T> void bar() {}\n"
"template <typename T> void bar() requires Foo<T> {}\n" "template <typename T> void bar() requires Foo<T> {}\n"
"template <typename T> void bar() requires Foo<T>;\n"
"template <typename T> requires Foo<T> Bar(T) -> Bar<T>;", "template <typename T> requires Foo<T> Bar(T) -> Bar<T>;",
Style); Style);
auto ColumnStyle = Style; auto ColumnStyle = Style;
ColumnStyle.ColumnLimit = 40; ColumnStyle.ColumnLimit = 40;
verifyFormat("template <typename AAAAAAA>\n" verifyFormat("template <typename AAAAAAA>\n"
"requires Foo<T> struct Bar {};\n" "requires Foo<T> struct Bar {};\n"
"template <typename AAAAAAA>\n" "template <typename AAAAAAA>\n"
Show All 36 LinesTEST_F(FormatTest, RequiresClausesPositions) {
verifyFormat("template <typename T>\n" verifyFormat("template <typename T>\n"
"requires Foo<T> struct Bar {};\n" "requires Foo<T> struct Bar {};\n"
"template <typename T>\n" "template <typename T>\n"
"requires Foo<T> void bar() {}\n" "requires Foo<T> void bar() {}\n"
"template <typename T>\n" "template <typename T>\n"
"void bar()\n" "void bar()\n"
"requires Foo<T> {}\n" "requires Foo<T> {}\n"
"template <typename T>\n" "template <typename T>\n"
"void bar()\n"
"requires Foo<T>;\n"
"template <typename T>\n"
"requires Foo<T> Bar(T) -> Bar<T>;", "requires Foo<T> Bar(T) -> Bar<T>;",
Style); Style);
verifyFormat("template <typename AAAAAAA>\n" verifyFormat("template <typename AAAAAAA>\n"
"requires Foo<AAAAAAAAAAAAAAAA>\n" "requires Foo<AAAAAAAAAAAAAAAA>\n"
"struct Bar {};\n" "struct Bar {};\n"
"template <typename AAAAAAA>\n" "template <typename AAAAAAA>\n"
"requires Foo<AAAAAAAAAAAAAAAA>\n" "requires Foo<AAAAAAAAAAAAAAAA>\n"
▲ Show 20 Lines • Show All 43 Lines • ▼ Show 20 LinesTEST_F(FormatTest, RequiresClausesPositions) {
verifyFormat("template <typename T> requires Foo<T>\n" verifyFormat("template <typename T> requires Foo<T>\n"
"struct Bar {};\n" "struct Bar {};\n"
"template <typename T> requires Foo<T>\n" "template <typename T> requires Foo<T>\n"
"void bar() {}\n" "void bar() {}\n"
"template <typename T>\n" "template <typename T>\n"
"void bar() requires Foo<T>\n" "void bar() requires Foo<T>\n"
"{}\n" "{}\n"
"template <typename T> void bar() requires Foo<T>;\n"
"template <typename T> requires Foo<T>\n" "template <typename T> requires Foo<T>\n"
"Bar(T) -> Bar<T>;", "Bar(T) -> Bar<T>;",
Style); Style);
verifyFormat("template <typename AAAAAAA>\n" verifyFormat("template <typename AAAAAAA>\n"
"requires Foo<AAAAAAAAAAAAAAAA>\n" "requires Foo<AAAAAAAAAAAAAAAA>\n"
"struct Bar {};\n" "struct Bar {};\n"
"template <typename AAAAAAA>\n" "template <typename AAAAAAA>\n"
▲ Show 20 Lines • Show All 1,112 Lines • Show Last 20 Lines