From 7cb0bc8abf6efd7e25b0091a7306de23c3a0f314 Mon Sep 17 00:00:00 2001 From: owenca Date: Mon, 13 Jun 2022 00:10:26 -0700 Subject: [PATCH] [clang-format] Handle more cases for RemoveBracesLLVM Call mightFitOneOneline() on the line before the closing brace only if it is at the level of the block. Differential Revision: https://reviews.llvm.org/D127614 --- clang/lib/Format/UnwrappedLineParser.cpp | 5 +++-- clang/unittests/Format/FormatTest.cpp | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/clang/lib/Format/UnwrappedLineParser.cpp b/clang/lib/Format/UnwrappedLineParser.cpp index 2721949..77a59d8 100644 --- a/clang/lib/Format/UnwrappedLineParser.cpp +++ b/clang/lib/Format/UnwrappedLineParser.cpp @@ -844,7 +844,7 @@ FormatToken *UnwrappedLineParser::parseBlock( size_t PPStartHash = computePPHash(); - unsigned InitialLevel = Line->Level; + const unsigned InitialLevel = Line->Level; nextToken(/*LevelDifference=*/AddLevels); // Bail out if there are too many levels. Otherwise, the stack might overflow. @@ -905,7 +905,8 @@ FormatToken *UnwrappedLineParser::parseBlock( return false; } assert(!CurrentLines->empty()); - if (!mightFitOnOneLine(CurrentLines->back())) + auto &LastLine = CurrentLines->back(); + if (LastLine.Level == InitialLevel + 1 && !mightFitOnOneLine(LastLine)) return false; if (Tok->is(TT_ElseLBrace)) return true; diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp index 27984ec..972f3f1 100644 --- a/clang/unittests/Format/FormatTest.cpp +++ b/clang/unittests/Format/FormatTest.cpp @@ -25784,6 +25784,25 @@ TEST_F(FormatTest, RemoveBraces) { "}", 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; verifyFormat("if (a)\n" " b234567890223456789032345678904234567890 = " -- 2.7.4