Fixes for spaces around C# object initializers

[jbcoe]

Summary

Fix spaces around typename and [] in C# object initializers.

[MyDeveloperDay]

LGTM, thanks once again for the C# patch!

[krasimir]

clang/lib/Format/TokenAnnotator.cpp

2879

This test feels a bit too rigid: you might additionally want to consider new Type<Param> { and new Type /*comment*/ { and new [] /* comment */ {.
For these you might find the MatchingParen and getPreviousNonComment useful. And example for this is below, at line 2880-2885 in javascript handling.

2880

The TT_Unknown is a bit confusing -- why is it needed? If this is a workaround for something, please add it as a comment. We might need to improve the token detection later to allow for more complicated pattern matching.

[krasimir]

clang/unittests/Format/FormatTestCSharp.cpp

405

Is this needed for the formatting below? I find it surprising if this controls the spacing before braces.

[krasimir]

clang/lib/Format/TokenAnnotator.cpp

2879

Sorry, disregard the patterns with /* comment */ above. I guess the spaces around the comment there are enforced at another place.

[MyDeveloperDay]

clang/lib/Format/TokenAnnotator.cpp

2880

+1 that comment what was Left I think we need to be more specific

[jbcoe]

Minor changes to address review comments.

[krasimir]

Thank you!

clang/lib/Format/TokenAnnotator.cpp

if (Style.isCpp()) {
     // space between type and variable e.g. Dictionary<string,string> foo;
     if (Left.is(TT_TemplateCloser) && Right.is(TT_StartOfName))
       return true;
     // space between keywords and paren e.g. "using ("
     if (Right.is(tok::l_paren))
       if (Left.is(tok::kw_using))
         return Style.SpaceBeforeParens == FormatStyle::SBPO_ControlStatements ||
                spaceRequiredBeforeParens(Right);
+    // space between ']' and '{'
+    if (Left.is(tok::r_square) && Right.is(tok::l_brace))
+      return true;
+    // space before '{' in "new MyType {"
+    if (Right.is(tok::l_brace) && Left.Previous &&
+        Left.Previous->is(tok::kw_new))
+      return true;
   } else if (Style.Language == FormatStyle::LK_JavaScript) {
     if (Left.is(TT_JsFatArrow))
       return true;
     // for await ( ...
     if (Right.is(tok::l_paren) && Left.is(Keywords.kw_await) && Left.Previous &&
         Left.Previous->is(tok::kw_for))
       return true;
     if (Left.is(Keywords.kw_async) && Right.is(tok::l_paren) &&

clang/unittests/Format/FormatTestCSharp.cpp

TEST_F(FormatTestCSharp, CSharpSpaceBefore) {
   verifyFormat("switch(x) {}", Style);
   verifyFormat("do {\n"
                "} while(x);",
                Style);
 }
 
 TEST_F(FormatTestCSharp, CSharpSpaceAfterCStyleCast) {
   FormatStyle Style = getGoogleStyle(FormatStyle::LK_CSharp);
 
   verifyFormat("(int)x / y;", Style);
 
   Style.SpaceAfterCStyleCast = true;
   verifyFormat("(int) x / y;", Style);
 }
 
 TEST_F(FormatTestCSharp, CSharpEscapedQuotesInVerbatimStrings) {
   FormatStyle Style = getGoogleStyle(FormatStyle::LK_CSharp);
var x = foo(className, $@"some code:
 
   // Interpolated string with embedded multiline string.
   Code = R"(Console.WriteLine($"{string.Join(@",
     ", values)}");)";
 
   EXPECT_EQ(Code, format(Code, Style));
 }
 
+TEST_F(FormatTestCSharp, CSharpObjectInitializers) {
+  FormatStyle Style = getGoogleStyle(FormatStyle::LK_CSharp);
+
+  // Start code fragemnts 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,
+                        }};)",
+               Style);
+}
+
 } // namespace format
 } // end namespace clang