[clang-format] Fix a bug in "AfterControlStatement: MultiLine"

[owenpan]

Summary

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

[curdeius]

clang/unittests/Format/FormatTest.cpp

3213

This seems unrelated, is it so really?

[owenpan]

clang/unittests/Format/FormatTest.cpp

3213

It's redundant but unrelated. We can delete it in a separate patch when replacing every EXPECT_EQ with a verifyFormat.

clang/lib/Format/UnwrappedLineFormatter.cpp

if (NextLine.First->is(tok::l_brace)) {
                                    tok::kw_do, TT_ForEachMacro) ||
            (TheLine->First->is(tok::r_brace) && TheLine->First->Next &&
             TheLine->First->Next->isOneOf(tok::kw_else, tok::kw_catch))) &&
           Style.BraceWrapping.AfterControlStatement ==
               FormatStyle::BWACS_MultiLine) {
         // If possible, merge the next line's wrapped left brace with the
         // current line. Otherwise, leave it on the next line, as this is a
         // multi-line control statement.
-        return (Style.ColumnLimit == 0 ||
-                TheLine->Last->TotalLength <= Style.ColumnLimit)
+        return (Style.ColumnLimit == 0 || TheLine->Level * Style.IndentWidth +
+                                                  TheLine->Last->TotalLength <=
+                                              Style.ColumnLimit)
                    ? 1
                    : 0;
       }
       if (TheLine->First->isOneOf(tok::kw_if, tok::kw_else, tok::kw_while,
                                   tok::kw_for, TT_ForEachMacro)) {
         return (Style.BraceWrapping.AfterControlStatement ==
                 FormatStyle::BWACS_Always)
                    ? tryMergeSimpleBlock(I, E, Limit)

clang/unittests/Format/FormatTest.cpp

EXPECT_EQ("try {\n"
             "}",
             format("try{foo();}catch(...){bar();}", Style));
   EXPECT_EQ("do {\n"
             "  foo();\n"
             "} while (bar &&\n"
             "         baz);",
             format("do{foo();}while(bar&&baz);", Style));
   // Long lines should put opening brace on new line.
+  verifyFormat("void f() {\n"
+               "  if (a1 && a2 &&\n"
+               "      a3)\n"
+               "  {\n"
+               "    quux();\n"
+               "  }\n"
+               "}",
+               "void f(){if(a1&&a2&&a3){quux();}}", Style);
   EXPECT_EQ("if (foo && bar &&\n"
             "    baz)\n"
             "{\n"
             "  quux();\n"
             "}",
             format("if(foo&&bar&&baz){quux();}", Style));
   EXPECT_EQ("if (foo && bar &&\n"
             "    baz)\n"
EXPECT_EQ("try {\n"
             "  foo();\n"
             "}\n"
             "catch (...) {\n"
             "  baz();\n"
             "}",
             format("try{foo();}catch(...){baz();}", Style));
 
   Style.BraceWrapping.AfterFunction = true;
   Style.BraceWrapping.AfterControlStatement = FormatStyle::BWACS_MultiLine;
   Style.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_All;
   Style.ColumnLimit = 80;
   verifyFormat("void shortfunction() { bar(); }", Style);
 
   Style.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_None;
   verifyFormat("void shortfunction()\n"
                "{\n"
                "  bar();\n"