[clang] [clang-format] Handle C# where clause in SeparateDefinitionBlocks (PR #139034)

[Owen Pan via cfe-commits]

https://github.com/owenca updated https://github.com/llvm/llvm-project/pull/139034

>From 11a3f6f44914e40b49f9ce00256724ce1fb82fa1 Mon Sep 17 00:00:00 2001
From: Owen Pan <owenpiano at gmail.com>
Date: Thu, 8 May 2025 00:12:44 -0700
Subject: [PATCH 1/2] [clang-format] Handle C# where clause in
 SeparateDefinitionBlocks

Fix #61956
---
 clang/lib/Format/DefinitionBlockSeparator.cpp           | 6 ++++++
 clang/unittests/Format/DefinitionBlockSeparatorTest.cpp | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/clang/lib/Format/DefinitionBlockSeparator.cpp b/clang/lib/Format/DefinitionBlockSeparator.cpp
index 319236d3bd618..c4d609083977e 100644
--- a/clang/lib/Format/DefinitionBlockSeparator.cpp
+++ b/clang/lib/Format/DefinitionBlockSeparator.cpp
@@ -137,6 +137,12 @@ void DefinitionBlockSeparator::separateBlocks(
     const auto MayPrecedeDefinition = [&](const int Direction = -1) {
       assert(Direction >= -1);
       assert(Direction <= 1);
+
+      if (Style.isCSharp() &&
+          Lines[OpeningLineIndex]->First->is(TT_CSharpGenericTypeConstraint)) {
+        return true;
+      }
+
       const size_t OperateIndex = OpeningLineIndex + Direction;
       assert(OperateIndex < Lines.size());
       const auto &OperateLine = Lines[OperateIndex];
diff --git a/clang/unittests/Format/DefinitionBlockSeparatorTest.cpp b/clang/unittests/Format/DefinitionBlockSeparatorTest.cpp
index b26b9f4f4ff62..1f4245b703fb7 100644
--- a/clang/unittests/Format/DefinitionBlockSeparatorTest.cpp
+++ b/clang/unittests/Format/DefinitionBlockSeparatorTest.cpp
@@ -574,6 +574,11 @@ TEST_F(DefinitionBlockSeparatorTest, CSharp) {
                "\r\n"
                "public class FoobarClass {\r\n"
                "  int foobar;\r\n"
+               "}\r\n"
+               "\r\n"
+               "public class LogFactory<TLogger>\r\n"
+               "    where TLogger : class, new() {\r\n"
+               "  int i;\r\n"
                "}",
                Style);
 }

>From a54a5c89944a60bda378175ecf96f28e514893c3 Mon Sep 17 00:00:00 2001
From: Owen Pan <owenpiano at gmail.com>
Date: Thu, 8 May 2025 19:12:25 -0700
Subject: [PATCH 2/2] Update clang/lib/Format/DefinitionBlockSeparator.cpp

---
 clang/lib/Format/DefinitionBlockSeparator.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/clang/lib/Format/DefinitionBlockSeparator.cpp b/clang/lib/Format/DefinitionBlockSeparator.cpp
index c4d609083977e..ded51bc6c013c 100644
--- a/clang/lib/Format/DefinitionBlockSeparator.cpp
+++ b/clang/lib/Format/DefinitionBlockSeparator.cpp
@@ -138,10 +138,8 @@ void DefinitionBlockSeparator::separateBlocks(
       assert(Direction >= -1);
       assert(Direction <= 1);
 
-      if (Style.isCSharp() &&
-          Lines[OpeningLineIndex]->First->is(TT_CSharpGenericTypeConstraint)) {
+      if (Lines[OpeningLineIndex]->First->is(TT_CSharpGenericTypeConstraint))
         return true;
-      }
 
       const size_t OperateIndex = OpeningLineIndex + Direction;
       assert(OperateIndex < Lines.size());