Skip to content

[clang-format] Fix operator overload inconsistency in BreakAfterAttributes: Always #74943

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Dec 23, 2023
Merged

[clang-format] Fix operator overload inconsistency in BreakAfterAttributes: Always #74943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b80f857
Fixes overload operator in BreakAfterAttributes
XDeme1 Dec 9, 2023
67a018f
Addresses 1, 2 and 4 comments
XDeme1 Dec 9, 2023
f9b8d8c
Addresses comment 3
XDeme1 Dec 9, 2023
6158f2b
Move test to the bottom
XDeme1 Dec 9, 2023
f63b3a7
Make use of a lambda and early return false
XDeme1 Dec 9, 2023
ddf4c77
Change test back to verifyFormat
XDeme1 Dec 10, 2023
b3d39d9
Addresses comments
XDeme1 Dec 10, 2023
58671ea
Addresses owenca comment
XDeme1 Dec 22, 2023
8528e75
Split tests
XDeme1 Dec 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 9 additions & 11 deletions clang/lib/Format/ContinuationIndenter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -583,17 +583,15 @@ bool ContinuationIndenter::mustBreak(const LineState &State) {
return true;
}

// If the return type spans multiple lines, wrap before the function name.
if (((Current.is(TT_FunctionDeclarationName) &&
!State.Line->ReturnTypeWrapped &&
// Don't break before a C# function when no break after return type.
(!Style.isCSharp() ||
Style.AlwaysBreakAfterReturnType != FormatStyle::RTBS_None) &&
// Don't always break between a JavaScript `function` and the function
// name.
!Style.isJavaScript()) ||
(Current.is(tok::kw_operator) && Previous.isNot(tok::coloncolon))) &&
Previous.isNot(tok::kw_template) && CurrentState.BreakBeforeParameter) {
if (Current.is(TT_FunctionDeclarationName) &&
!State.Line->ReturnTypeWrapped &&
// Don't break before a C# function when no break after return type.
(!Style.isCSharp() ||
Style.AlwaysBreakAfterReturnType != FormatStyle::RTBS_None) &&
// Don't always break between a JavaScript `function` and the function
// name.
!Style.isJavaScript() && Previous.isNot(tok::kw_template) &&
CurrentState.BreakBeforeParameter) {
return true;
}

Expand Down
13 changes: 13 additions & 0 deletions clang/unittests/Format/FormatTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26451,6 +26451,19 @@ TEST_F(FormatTest, BreakAfterAttributes) {
"{\n"
"}",
CtorDtorCode, Style);

verifyFormat("struct Foo {\n"
" [[maybe_unused]]\n"
" void operator+();\n"
"};\n"
"[[nodiscard]]\n"
"Foo &operator-(Foo &);",
Style);

Style.ReferenceAlignment = FormatStyle::ReferenceAlignmentStyle::RAS_Left;
verifyFormat("[[nodiscard]]\n"
"Foo& operator-(Foo&);",
Style);
}

TEST_F(FormatTest, InsertNewlineAtEOF) {
Expand Down