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

[clang-format] Handle "// clang-format off" for RemoveBracesLLVM 

Differential Revision: https://reviews.llvm.org/D121352
This commit is contained in:
owenca 2022-03-09 20:38:43 -08:00
parent 19c6098097
commit e2b219bded
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1808,7 +1808,8 @@ private:
removeBraces(Line->Children, Result);
if (!Line->Affected)
continue;
for (FormatToken *Token = Line->First; Token; Token = Token->Next) {
for (FormatToken *Token = Line->First; Token && !Token->Finalized;
Token = Token->Next) {
if (!Token->Optional)
continue;
assert(Token->isOneOf(tok::l_brace, tok::r_brace));

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

@ -24805,6 +24805,19 @@ TEST_F(FormatTest, RemoveBraces) {
"}",
Style);
verifyFormat("// clang-format off\n"
"// comment\n"
"while (i > 0) { --i; }\n"
"// clang-format on\n"
"while (j < 0)\n"
" ++j;",
"// clang-format off\n"
"// comment\n"
"while (i > 0) { --i; }\n"
"// clang-format on\n"
"while (j < 0) { ++j; }",
Style);
verifyFormat("if (a)\n"
" b; // comment\n"
"else if (c)\n"