This is an archive of the discontinued LLVM Phabricator instance.

Differential D127614

[clang-format] Handle more cases for RemoveBracesLLVM
ClosedPublic

Authored by owenpan on Jun 13 2022, 12:23 AM.

Details

Reviewers
curdeius
MyDeveloperDay
HazardyKnusperkeks
Commits
rG7cb0bc8abf6e: [clang-format] Handle more cases for RemoveBracesLLVM
Summary

Call mightFitOneOneline() on the line before the closing brace only if it is at the level of the block.

Diff Detail

Event Timeline

owenpan created this revision.Jun 13 2022, 12:23 AM
Herald added a project: Restricted Project. · View Herald TranscriptJun 13 2022, 12:23 AM
owenpan requested review of this revision.Jun 13 2022, 12:23 AM
Herald added a project: Restricted Project. · View Herald TranscriptJun 13 2022, 12:23 AM
Herald added a subscriber: cfe-commits. · View Herald Transcript
Harbormaster completed remote builds in B169366: Diff 436285.Jun 13 2022, 12:59 AM
curdeius accepted this revision.Jun 13 2022, 1:11 AM
This revision is now accepted and ready to land.Jun 13 2022, 1:11 AM
This revision was landed with ongoing or failed builds.Jun 13 2022, 12:10 PM
Closed by commit rG7cb0bc8abf6e: [clang-format] Handle more cases for RemoveBracesLLVM (authored by owenpan). · Explain Why
This revision was automatically updated to reflect the committed changes.
owenpan added a commit: rG7cb0bc8abf6e: [clang-format] Handle more cases for RemoveBracesLLVM.

Revision Contents

PathSize
clang/
lib/
Format/
5 lines
unittests/
Format/
19 lines

Diff 436507

clang/lib/Format/UnwrappedLineParser.cpp

Show First 20 Lines • Show All 838 Lines • ▼ Show 20 LinesFormatToken *UnwrappedLineParser::parseBlock(
// For Whitesmiths mode, jump to the next level prior to skipping over the // For Whitesmiths mode, jump to the next level prior to skipping over the
// braces. // braces.
if (AddLevels > 0 && Style.BreakBeforeBraces == FormatStyle::BS_Whitesmiths) if (AddLevels > 0 && Style.BreakBeforeBraces == FormatStyle::BS_Whitesmiths)
++Line->Level; ++Line->Level;
size_t PPStartHash = computePPHash(); size_t PPStartHash = computePPHash();
unsigned InitialLevel = Line->Level; const unsigned InitialLevel = Line->Level;
nextToken(/*LevelDifference=*/AddLevels); nextToken(/*LevelDifference=*/AddLevels);
// Bail out if there are too many levels. Otherwise, the stack might overflow. // Bail out if there are too many levels. Otherwise, the stack might overflow.
if (Line->Level > 300) if (Line->Level > 300)
return nullptr; return nullptr;
if (MacroBlock && FormatTok->is(tok::l_paren)) if (MacroBlock && FormatTok->is(tok::l_paren))
parseParens(); parseParens();
▲ Show 20 Lines • Show All 44 Lines • ▼ Show 20 Lines if (KeepBraces && !HasRequiredIfBraces)
return false; return false;
if (Tok->isNot(TT_ElseLBrace) || !HasRequiredIfBraces) { if (Tok->isNot(TT_ElseLBrace) || !HasRequiredIfBraces) {
const FormatToken *Previous = Tokens->getPreviousToken(); const FormatToken *Previous = Tokens->getPreviousToken();
assert(Previous); assert(Previous);
if (Previous->is(tok::r_brace) && !Previous->Optional) if (Previous->is(tok::r_brace) && !Previous->Optional)
return false; return false;
} }
assert(!CurrentLines->empty()); assert(!CurrentLines->empty());
if (!mightFitOnOneLine(CurrentLines->back())) auto &LastLine = CurrentLines->back();
if (LastLine.Level == InitialLevel + 1 && !mightFitOnOneLine(LastLine))
return false; return false;
if (Tok->is(TT_ElseLBrace)) if (Tok->is(TT_ElseLBrace))
return true; return true;
if (WrappedOpeningBrace) { if (WrappedOpeningBrace) {
assert(Index > 0); assert(Index > 0);
--Index; // The line above the wrapped l_brace. --Index; // The line above the wrapped l_brace.
Tok = nullptr; Tok = nullptr;
} }
▲ Show 20 Lines • Show All 3,394 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 25,778 Lines • ▼ Show 20 LinesTEST_F(FormatTest, RemoveBraces) {
verifyFormat("for (int &i : chars)\n" verifyFormat("for (int &i : chars)\n"
" ++i;", " ++i;",
"for (int &i :\n" "for (int &i :\n"
" chars) {\n" " chars) {\n"
" ++i;\n" " ++i;\n"
"}", "}",
Style); Style);
verifyFormat("if (a)\n"
" b;\n"
"else if (c) {\n"
" d;\n"
" e;\n"
"} else\n"
" f = g(foo, bar,\n"
" baz);",
"if (a)\n"
" b;\n"
"else {\n"
" if (c) {\n"
" d;\n"
" e;\n"
" } else\n"
" f = g(foo, bar, baz);\n"
"}",
Style);
Style.ColumnLimit = 0; Style.ColumnLimit = 0;
verifyFormat("if (a)\n" verifyFormat("if (a)\n"
" b234567890223456789032345678904234567890 = " " b234567890223456789032345678904234567890 = "
"c234567890223456789032345678904234567890;", "c234567890223456789032345678904234567890;",
"if (a) {\n" "if (a) {\n"
" b234567890223456789032345678904234567890 = " " b234567890223456789032345678904234567890 = "
"c234567890223456789032345678904234567890;\n" "c234567890223456789032345678904234567890;\n"
"}", "}",
▲ Show 20 Lines • Show All 491 Lines • Show Last 20 Lines