[clang-format] Fix SeparateDefinitionBlocks breaking up function-try-block.

[curdeius]

Summary

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

[owenpan]

We can refactor by extending _verifyFormat() instead of adding a new function.

clang/unittests/Format/DefinitionBlockSeparatorTest.cpp

46–47

54–55

67

458

468

[curdeius]

Address review comments.

clang/lib/Format/UnwrappedLineParser.cpp

while (FormatTok->isNot(tok::l_brace)) {
       if (FormatTok->isOneOf(tok::semi, tok::r_brace, tok::eof)) {
         if (Style.RemoveBracesLLVM)
           NestedTooDeep.pop_back();
         return;
       }
       nextToken();
     }
     NeedsUnwrappedLine = false;
+    Line->MustBeDeclaration = false;
     CompoundStatementIndenter Indenter(this, Style, Line->Level);
     parseBlock();
     if (Style.BraceWrapping.BeforeCatch)
       addUnwrappedLine();
     else
       NeedsUnwrappedLine = true;
   }
 

clang/unittests/Format/DefinitionBlockSeparatorTest.cpp

separateDefinitionBlocks(llvm::StringRef Code,
                            const FormatStyle &Style = getLLVMStyle()) {
     return separateDefinitionBlocks(
         Code,
         /*Ranges=*/{1, tooling::Range(0, Code.size())}, Style);
   }
 
   static void _verifyFormat(const char *File, int Line, llvm::StringRef Code,
                             const FormatStyle &Style = getLLVMStyle(),
-                            llvm::StringRef ExpectedCode = "") {
+                            llvm::StringRef ExpectedCode = "",
+                            bool Inverse = true) {
     ::testing::ScopedTrace t(File, Line, ::testing::Message() << Code.str());
     bool HasOriginalCode = true;
     if (ExpectedCode == "") {
       ExpectedCode = Code;
       HasOriginalCode = false;
     }
 
+    EXPECT_EQ(ExpectedCode, separateDefinitionBlocks(ExpectedCode, Style))
+        << "Expected code is not stable";
+    if (Inverse) {
       FormatStyle InverseStyle = Style;
       if (Style.SeparateDefinitionBlocks == FormatStyle::SDS_Always)
         InverseStyle.SeparateDefinitionBlocks = FormatStyle::SDS_Never;
       else
         InverseStyle.SeparateDefinitionBlocks = FormatStyle::SDS_Always;
-    EXPECT_EQ(ExpectedCode, separateDefinitionBlocks(ExpectedCode, Style))
-        << "Expected code is not stable";
       EXPECT_NE(ExpectedCode,
                 separateDefinitionBlocks(ExpectedCode, InverseStyle))
           << "Inverse formatting makes no difference";
+    }
     std::string CodeToFormat =
         HasOriginalCode ? Code.str() : removeEmptyLines(Code);
     std::string Result = separateDefinitionBlocks(CodeToFormat, Style);
     EXPECT_EQ(ExpectedCode, Result) << "Test failed. Formatted:\n" << Result;
   }
 
   static std::string removeEmptyLines(llvm::StringRef Code) {
     std::string Result = "";
     for (auto Char : Code.str()) {
verifyFormat("namespace NS\n"
                "    // if condition\n"
                "  }\n"
                "  return r;\n"
                "}\n"
                "} // namespace NS",
                Style);
 }
 
+TEST_F(DefinitionBlockSeparatorTest, TryBlocks) {
+  FormatStyle Style = getLLVMStyle();
+  Style.BreakBeforeBraces = FormatStyle::BS_Allman;
+  Style.SeparateDefinitionBlocks = FormatStyle::SDS_Always;
+  verifyFormat("void FunctionWithInternalTry()\n"
+               "{\n"
+               "  try\n"
+               "  {\n"
+               "    return;\n"
+               "  }\n"
+               "  catch (const std::exception &)\n"
+               "  {\n"
+               "  }\n"
+               "}",
+               Style, "", /*Inverse=*/false);
+  verifyFormat("void FunctionWithTryBlock()\n"
+               "try\n"
+               "{\n"
+               "  return;\n"
+               "}\n"
+               "catch (const std::exception &)\n"
+               "{\n"
+               "}",
+               Style, "", /*Inverse=*/false);
+}
+
 TEST_F(DefinitionBlockSeparatorTest, Leave) {
   FormatStyle Style = getLLVMStyle();
   Style.SeparateDefinitionBlocks = FormatStyle::SDS_Leave;
   Style.MaxEmptyLinesToKeep = 3;
   std::string LeaveAs = "namespace {\n"
                         "\n"
                         "// Enum test1\n"
                         "// Enum test2\n"