maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[clang-format] Rework removeBraces() in Format.cpp 

Fixes #57373.

Differential Revision: https://reviews.llvm.org/D132719
This commit is contained in:
owenca 2022-08-25 23:13:34 -07:00
parent 7743badafa
commit 44a06b51b2
2 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
clang/lib/Format/Format.cpp
View File

@ -1902,31 +1902,30 @@ private:
void removeBraces(SmallVectorImpl<AnnotatedLine *> &Lines,
tooling::Replacements &Result) {
const auto &SourceMgr = Env.getSourceManager();
bool EndsWithComment = false;
for (AnnotatedLine *Line : Lines) {
const auto End = Lines.end();
for (auto I = Lines.begin(); I != End; ++I) {
const auto Line = *I;
removeBraces(Line->Children, Result);
if (Line->Affected) {
for (FormatToken *Token = Line->First; Token && !Token->Finalized;
Token = Token->Next) {
if (!Token->Optional)
continue;
assert(Token->isOneOf(tok::l_brace, tok::r_brace));
assert(Token->Previous || Token == Line->First);
const FormatToken *Next = Token->Next;
assert(Next || Token == Line->Last);
const auto Start =
(!Token->Previous && EndsWithComment) ||
(Next && !(Next->isOneOf(tok::kw_else, tok::comment) &&
Next->NewlinesBefore > 0))
? Token->Tok.getLocation()
: Token->WhitespaceRange.getBegin();
const auto Range =
CharSourceRange::getCharRange(Start, Token->Tok.getEndLoc());
cantFail(Result.add(tooling::Replacement(SourceMgr, Range, "")));
}
if (!Line->Affected)
continue;
const auto NextLine = I + 1 == End ? nullptr : I[1];
for (auto Token = Line->First; Token && !Token->Finalized;
Token = Token->Next) {
if (!Token->Optional)
continue;
assert(Token->isOneOf(tok::l_brace, tok::r_brace));
auto Next = Token->Next;
assert(Next || Token == Line->Last);
if (!Next && NextLine)
Next = NextLine->First;
const auto Start =
Next && Next->NewlinesBefore == 0 && Next->isNot(tok::eof)
? Token->Tok.getLocation()
: Token->WhitespaceRange.getBegin();
const auto Range =
CharSourceRange::getCharRange(Start, Token->Tok.getEndLoc());
cantFail(Result.add(tooling::Replacement(SourceMgr, Range, "")));
}
assert(Line->Last);
EndsWithComment = Line->Last->is(tok::comment);
}
}
};

8
clang/unittests/Format/FormatTest.cpp
View File

@ -26005,6 +26005,14 @@ TEST_F(FormatTest, RemoveBraces) {
"}",
Style);
verifyFormat("if (a) // comment\n"
" b = 1;",
"if (a) // comment\n"
"{\n"
" b = 1;\n"
"}",
Style);
Style.ColumnLimit = 20;
verifyFormat("int ab = [](int i) {\n"