This is an archive of the discontinued LLVM Phabricator instance.

Differential D127054

[clang-format] Handle attributes for for/while loops
ClosedPublic

Authored by owenpan on Jun 4 2022, 12:30 PM.

Details

Reviewers
curdeius
HazardyKnusperkeks
MyDeveloperDay
Commits
rGfc1c160f7330: [clang-format] Handle attributes for for/while loops
Summary

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

Diff Detail

Event Timeline

owenpan created this revision.Jun 4 2022, 12:30 PM
Herald added a project: Restricted Project. · View Herald TranscriptJun 4 2022, 12:30 PM
owenpan requested review of this revision.Jun 4 2022, 12:30 PM
Herald added a project: Restricted Project. · View Herald TranscriptJun 4 2022, 12:30 PM
Herald added a subscriber: cfe-commits. · View Herald Transcript
Harbormaster completed remote builds in B167907: Diff 434284.Jun 4 2022, 1:10 PM
curdeius accepted this revision.Jun 5 2022, 12:20 AM

Great!

This revision is now accepted and ready to land.Jun 5 2022, 12:20 AM
HazardyKnusperkeks accepted this revision.Jun 5 2022, 1:56 PM
Closed by commit rGfc1c160f7330: [clang-format] Handle attributes for for/while loops (authored by owenpan). · Explain WhyJun 5 2022, 3:46 PM
This revision was automatically updated to reflect the committed changes.
owenpan added a commit: rGfc1c160f7330: [clang-format] Handle attributes for for/while loops.
MyDeveloperDay added a comment.Jun 6 2022, 2:04 AM

nice!

Revision Contents

PathSize
clang/
lib/
Format/
1 line
unittests/
Format/
32 lines

Diff 434357

clang/lib/Format/UnwrappedLineParser.cpp

Show First 20 Lines • Show All 2,883 Lines • ▼ Show 20 Linesvoid UnwrappedLineParser::parseForOrWhileLoop() {
// JS' for await ( ... // JS' for await ( ...
if (Style.isJavaScript() && FormatTok->is(Keywords.kw_await)) if (Style.isJavaScript() && FormatTok->is(Keywords.kw_await))
nextToken(); nextToken();
if (Style.isCpp() && FormatTok->is(tok::kw_co_await)) if (Style.isCpp() && FormatTok->is(tok::kw_co_await))
nextToken(); nextToken();
if (FormatTok->is(tok::l_paren)) if (FormatTok->is(tok::l_paren))
parseParens(); parseParens();
handleAttributes();
parseLoopBody(KeepBraces, /*WrapRightBrace=*/true); parseLoopBody(KeepBraces, /*WrapRightBrace=*/true);
} }
void UnwrappedLineParser::parseDoWhile() { void UnwrappedLineParser::parseDoWhile() {
assert(FormatTok->is(tok::kw_do) && "'do' expected"); assert(FormatTok->is(tok::kw_do) && "'do' expected");
nextToken(); nextToken();
parseLoopBody(/*KeepBraces=*/true, Style.BraceWrapping.BeforeWhile); parseLoopBody(/*KeepBraces=*/true, Style.BraceWrapping.BeforeWhile);
▲ Show 20 Lines • Show All 1,386 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,840 Lines • ▼ Show 20 LinesTEST_F(FormatTest, LikelyUnlikely) {
verifyFormat("if (argc > 5) [[unlikely]]\n" verifyFormat("if (argc > 5) [[unlikely]]\n"
" return 29;\n", " return 29;\n",
Style); Style);
verifyFormat("if (argc > 5) [[likely]]\n" verifyFormat("if (argc > 5) [[likely]]\n"
" return 29;\n", " return 29;\n",
Style); Style);
verifyFormat("while (limit > 0) [[unlikely]] {\n"
" --limit;\n"
"}",
Style);
verifyFormat("for (auto &limit : limits) [[likely]] {\n"
" --limit;\n"
"}",
Style);
verifyFormat("for (auto &limit : limits) [[unlikely]]\n"
" --limit;",
Style);
verifyFormat("while (limit > 0) [[likely]]\n"
" --limit;",
Style);
Style.AttributeMacros.push_back("UNLIKELY"); Style.AttributeMacros.push_back("UNLIKELY");
Style.AttributeMacros.push_back("LIKELY"); Style.AttributeMacros.push_back("LIKELY");
verifyFormat("if (argc > 5) UNLIKELY\n" verifyFormat("if (argc > 5) UNLIKELY\n"
" return 29;\n", " return 29;\n",
Style); Style);
verifyFormat("if (argc > 5) UNLIKELY {\n" verifyFormat("if (argc > 5) UNLIKELY {\n"
" return 29;\n" " return 29;\n"
Show All 12 Lines verifyFormat("if (argc > 5) UNLIKELY {\n"
"}\n", "}\n",
Style); Style);
verifyFormat("if (argc > 5) [[unlikely]] {\n" verifyFormat("if (argc > 5) [[unlikely]] {\n"
" return 29;\n" " return 29;\n"
"} else LIKELY {\n" "} else LIKELY {\n"
" return 42;\n" " return 42;\n"
"}\n", "}\n",
Style); Style);
verifyFormat("for (auto &limit : limits) UNLIKELY {\n"
" --limit;\n"
"}",
Style);
verifyFormat("while (limit > 0) LIKELY {\n"
" --limit;\n"
"}",
Style);
verifyFormat("while (limit > 0) UNLIKELY\n"
" --limit;",
Style);
verifyFormat("for (auto &limit : limits) LIKELY\n"
" --limit;",
Style);
} }
TEST_F(FormatTest, PenaltyIndentedWhitespace) { TEST_F(FormatTest, PenaltyIndentedWhitespace) {
verifyFormat("Constructor()\n" verifyFormat("Constructor()\n"
" : aaaaaa(aaaaaa), aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n" " : aaaaaa(aaaaaa), aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
" aaaa(aaaaaaaaaaaaaaaaaa, " " aaaa(aaaaaaaaaaaaaaaaaa, "
"aaaaaaaaaaaaaaaaaat))"); "aaaaaaaaaaaaaaaaaat))");
verifyFormat("Constructor()\n" verifyFormat("Constructor()\n"
▲ Show 20 Lines • Show All 2,248 Lines • Show Last 20 Lines