Use correct initializer type

Author: GrahamTheCoder

CodeConverter/CSharp/ExpressionNodeVisitor.cs

@@ -558,7 +558,10 @@ public override async Task<CSharpSyntaxNode> VisitCollectionInitializer(VBasic.S
             var isExplicitCollectionInitializer = node.Parent is VBasic.Syntax.ObjectCollectionInitializerSyntax
                                                   || node.Parent is VBasic.Syntax.CollectionInitializerSyntax
                                                   || node.Parent is VBasic.Syntax.ArrayCreationExpressionSyntax;
-            var initializerKind = isExplicitCollectionInitializer ? SyntaxKind.CollectionInitializerExpression : SyntaxKind.ArrayInitializerExpression;
+            var initializerKind = node.IsParentKind(VBasic.SyntaxKind.ObjectCollectionInitializer) || node.IsParentKind(VBasic.SyntaxKind.ObjectCreationExpression) ?
+                SyntaxKind.CollectionInitializerExpression :
+                node.IsParentKind(VBasic.SyntaxKind.CollectionInitializer) && IsComplexInitializer(node) ? SyntaxKind.ComplexElementInitializerExpression :
+                SyntaxKind.ArrayInitializerExpression;
             var initializers = (await node.Initializers.SelectAsync(i => i.AcceptAsync(TriviaConvertingExpressionVisitor))).Cast<ExpressionSyntax>();
             var initializer = SyntaxFactory.InitializerExpression(initializerKind, SyntaxFactory.SeparatedList(initializers));
             if (isExplicitCollectionInitializer) return initializer;
@@ -576,6 +579,12 @@ public override async Task<CSharpSyntaxNode> VisitCollectionInitializer(VBasic.S
             return SyntaxFactory.ImplicitArrayCreationExpression(SyntaxFactory.TokenList(commas), initializer);
         }
 
+        private bool IsComplexInitializer(VBSyntax.CollectionInitializerSyntax node)
+        {
+            return _semanticModel.GetOperation(node.Parent.Parent) is IObjectOrCollectionInitializerOperation initializer &&
+                initializer.Initializers.OfType<IInvocationOperation>().Any();
+        }
+
         public override async Task<CSharpSyntaxNode> VisitQueryExpression(VBasic.Syntax.QueryExpressionSyntax node)
         {
             return await _queryConverter.ConvertClausesAsync(node.Clauses);

Tests/CSharp/ExpressionTests/AccessExpressionTests.cs

@@ -74,9 +74,7 @@ public void Test()
         var dict = new Dictionary<string, string>() { { ""a"", ""AAA"" }, { ""b"", ""bbb"" } };
         string v = dict?[""a""];
     }
-}
-1 target compilation errors:
-CS7036: There is no argument given that corresponds to the required formal parameter 'value' of 'Dictionary<string, string>.Add(string, string)'");
+}");
         }
 
         [Fact]

Tests/CSharp/ExpressionTests/ExpressionTests.cs

@@ -923,6 +923,7 @@ private void TestMethod(string str)
     }
 }");
         }
+
         [Fact]
         public async Task CollectionInitializersAsync()
         {
@@ -948,9 +949,7 @@ private void TestMethod()
         var intList = new List<int>() { 1 };
         var dict = new Dictionary<int, int>() { { 1, 2 }, { 3, 4 } };
     }
-}
-1 target compilation errors:
-CS7036: There is no argument given that corresponds to the required formal parameter 'value' of 'Dictionary<int, int>.Add(int, int)'");
+}");
         }
 
         [Fact]

Tests/CSharp/StatementTests/StatementTests.cs

@@ -934,9 +934,7 @@ private void TestMethod()
         // Declare a jagged array
         var sales = new double[12][];
     }
-}
-1 target compilation errors:
-CS8751: Internal error in the C# compiler.");
+}");
         }
 
         [Fact]
@@ -970,9 +968,7 @@ private void TestMethod()
     {
         var b = new[,] { { 1, 2 }, { 3, 4 } };
     }
-}
-1 target compilation errors:
-CS8751: Internal error in the C# compiler.");
+}");
         }
 
         [Fact]
@@ -989,9 +985,7 @@ private void TestMethod()
     {
         var b = new int[,] { { 1, 2 }, { 3, 4 } };
     }
-}
-1 target compilation errors:
-CS8751: Internal error in the C# compiler.");
+}");
         }
 
         [Fact]
@@ -1020,9 +1014,7 @@ private void TestMethod()
         var f = new int[0][,];
         var g = new int[1][,];
     }
-}
-1 target compilation errors:
-CS8751: Internal error in the C# compiler.");
+}");
         }
 
         [Fact]