[clang-format] Handle C# where clause in SeparateDefinitionBlocks (#139034)
Fix #61956
diff --git a/clang/lib/Format/DefinitionBlockSeparator.cpp b/clang/lib/Format/DefinitionBlockSeparator.cpp
index 319236d..ded51bc 100644
--- a/clang/lib/Format/DefinitionBlockSeparator.cpp
+++ b/clang/lib/Format/DefinitionBlockSeparator.cpp
@@ -137,6 +137,10 @@
const auto MayPrecedeDefinition = [&](const int Direction = -1) {
assert(Direction >= -1);
assert(Direction <= 1);
+
+ if (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 b26b9f4..1f4245b 100644
--- a/clang/unittests/Format/DefinitionBlockSeparatorTest.cpp
+++ b/clang/unittests/Format/DefinitionBlockSeparatorTest.cpp
@@ -574,6 +574,11 @@
"\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);
}
