[clang-format] Do not indent C# array initialisers as continuations

[jbcoe]

Summary

Flag '= {' as a braced init list when parsing C# code.

[jbcoe]

Needs https://reviews.llvm.org/D75731 and https://reviews.llvm.org/D75747 to be merged first.

[krasimir]

clang/lib/Format/UnwrappedLineParser.cpp

1443

A more general approach might be to adapt parseBracedList() itself to mark the block kind BK_BracedInit:
https://github.com/llvm/llvm-project/blob/7d2fdd3f6639731284dd8b6b274f01f04fd19215/clang/lib/Format/UnwrappedLineParser.cpp#L1628

Could you try to see if it will be easy/possible to get the same effect by adapting that?
If that's hard or has unintended side effects, we can reconsider.

[jbcoe]

clang/lib/Format/UnwrappedLineParser.cpp

1443

Setting block kind inside parseBracedList() caused test failures outside of C# tests.

I was hoping to make this surgical for now, hence the comment.

[krasimir]

This is OK with the comment in the code. Thank you!

[jbcoe]

Rebase and update patch.

clang/lib/Format/UnwrappedLineParser.cpp

case tok::equal:
         nextToken();
         if (FormatTok->is(tok::l_brace))
           parseChildBlock();
         break;
       }
 
       nextToken();
       if (FormatTok->Tok.is(tok::l_brace)) {
+        // Block kind should probably be set to BK_BracedInit for any language.
+        // C# needs this change to ensure that array initialisers and object
+        // initialisers are indented the same way.
+        if (Style.isCSharp())
+          FormatTok->BlockKind = BK_BracedInit;
         nextToken();
         parseBracedList();
       } else if (Style.Language == FormatStyle::LK_Proto &&
                  FormatTok->Tok.is(tok::less)) {
         nextToken();
         parseBracedList(/*ContinueOnSemicolons=*/false,
                         /*ClosingBraceKind=*/tok::greater);
       }
bool UnwrappedLineParser::tryToParseBracedList() {
   nextToken();
   parseBracedList();
   return true;
 }
 
 bool UnwrappedLineParser::parseBracedList(bool ContinueOnSemicolons,
                                           tok::TokenKind ClosingBraceKind) {
   bool HasError = false;
   
   // FIXME: Once we have an expression parser in the UnwrappedLineParser,
   // replace this by using parseAssigmentExpression() inside.
   do {
     if (Style.isCSharp()) {
       if (FormatTok->is(TT_JsFatArrow)) {
         nextToken();
         // Fat arrows can be followed by simple expressions or by child blocks
         // in curly braces.

clang/unittests/Format/FormatTestCSharp.cpp

 var myDict = new Dictionary<string, string> {
   ["name"] = _donald,
   ["age"] = Convert.ToString(DateTime.Today.Year - 1934),
   ["type"] = _duck,
 };)",
                Style);
 }
 
+TEST_F(FormatTestCSharp, CSharpArrayInitializers) {
+  FormatStyle Style = getGoogleStyle(FormatStyle::LK_CSharp);
+  
+  verifyFormat(R"(//
+private MySet<Node>[] setPoints = {
+  new Point<Node>(),
+  new Point<Node>(),
+};)",
+               Style);
+}
+
 TEST_F(FormatTestCSharp, CSharpNamedArguments) {
   FormatStyle Style = getGoogleStyle(FormatStyle::LK_CSharp);
 
   verifyFormat(R"(//
 PrintOrderDetails(orderNum: 31, productName: "Red Mug",
                   sellerName: "Gift Shop");)",
                Style);