[clang-format] C# does not indent braced initializers as continuations

[jbcoe]

Summary

C# treats object initializers as braced init blocks. Braced init blocks are no longer indented as continuations.

[jbcoe]

Remove comma to tidy up ugly format test and actually test what is needed.

[krasimir]

clang/unittests/Format/FormatTestCSharp.cpp

544

Please add test cases that demonstrate the +2 indent used when breaking inside C# object initializers.

[krasimir]

clang/unittests/Format/FormatTestCSharp.cpp

544

Consider also adding an example with a trailing comma if the behavior there can be different than the one without a trailing comma.

[jbcoe]

clang/unittests/Format/FormatTestCSharp.cpp

544

The test at L 529 already covers 2 space indent and a trailing comma.

[krasimir]

Thank you

clang/lib/Format/FormatToken.h

const FormatToken *getNextNonComment() const {
     while (Tok && Tok->is(tok::comment))
       Tok = Tok->Next;
     return Tok;
   }
 
   /// Returns \c true if this tokens starts a block-type list, i.e. a
   /// list that should be indented with a block indent.
   bool opensBlockOrBlockTypeList(const FormatStyle &Style) const {
+    // C# Does not indent object initialisers as continuations.
+    if (is(tok::l_brace) && BlockKind == BK_BracedInit && Style.isCSharp())
+      return true;
     if (is(TT_TemplateString) && opensScope())
       return true;
     return is(TT_ArrayInitializerLSquare) || is(TT_ProtoExtensionLSquare) ||
            (is(tok::l_brace) &&
             (BlockKind == BK_Block || is(TT_DictLiteral) ||
              (!Style.Cpp11BracedListStyle && NestingLevel == 0))) ||
            (is(tok::less) && (Style.Language == FormatStyle::LK_Proto ||
                               Style.Language == FormatStyle::LK_TextProto));

clang/lib/Format/UnwrappedLineParser.cpp

do {
     switch (FormatTok->Tok.getKind()) {
     case tok::caret:
       nextToken();
       if (FormatTok->is(tok::l_brace)) {
         parseChildBlock();
       }
       break;
     case tok::l_square:
+      if (Style.isCSharp())
+        parseSquare();
+      else
         tryToParseLambda();
       break;
     case tok::l_paren:
       parseParens();
       // JavaScript can just have free standing methods and getters/setters in
       // object literals. Detect them by a "{" following ")".
       if (Style.Language == FormatStyle::LK_JavaScript) {
         if (FormatTok->is(tok::l_brace))
           parseChildBlock();

clang/unittests/Format/FormatTestCSharp.cpp

 TEST_F(FormatTestCSharp, CSharpObjectInitializers) {
   FormatStyle Style = getGoogleStyle(FormatStyle::LK_CSharp);
 
   // Start code fragments with a comment line so that C++ raw string literals
   // as seen are identical to expected formatted code.
 
   verifyFormat(R"(//
 Shape[] shapes = new[] {
-    new Circle {
-        Radius = 2.7281,
-        Colour = Colours.Red,
-    },
-    new Square {
-        Side = 101.1,
-        Colour = Colours.Yellow,
-    },
 };)",
                Style);
 
   // Omitted final `,`s will change the formatting.
   verifyFormat(R"(//
 Shape[] shapes = new[] { new Circle { Radius = 2.7281, Colour = Colours.Red },
-                         new Square {
-                             Side = 101.1,
-                             Colour = Colours.Yellow,
-                         } };)",
+                         new Square { Side = 101.1, Colour = Colours.Yellow } };)",
                Style);
 
   // Lambdas can be supplied as initialiser arguments.
   verifyFormat(R"(//
 private Transformer _transformer = new X.Y {
-    Filler = (Shape shape) => { return new Transform.Fill(shape, RED); },
-    Scaler = (Shape shape) => { return new Transform.Resize(shape, 0.1); },
 };)",
                Style);
 }
 
 TEST_F(FormatTestCSharp, CSharpNamedArguments) {
   FormatStyle Style = getGoogleStyle(FormatStyle::LK_CSharp);
 
   verifyFormat(R"(//