Convert array type when there's an initializer

Part of #544

Author: GrahamTheCoder

CHANGELOG.md

@@ -19,7 +19,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 * Added constructors now only added to the relevant type - not other types in the same file
 * Converted non-static field initializers moved to constructor - [#281](https://github.com/icsharpcode/CodeConverter/issues/281)
 * Convert assignments using "Mid" built-in function
-
+* Improve conversion of array initializer types
 
 ### C# -> VB
 

CodeConverter/CSharp/CommonConversions.cs

@@ -249,11 +249,11 @@ private async Task<CSharpSyntaxNode> GetInitializerFromNameAndType(ITypeSymbol t
             if (rankSpecifiers.Count > 0)
             {
                 var rankSpecifiersWithSizes = await ConvertArrayRankSpecifierSyntaxes(name.ArrayRankSpecifiers, name.ArrayBounds);
-                if (rankSpecifiersWithSizes.SelectMany(ars => ars.Sizes).Any(e => !e.IsKind(CSSyntaxKind.OmittedArraySizeExpression)))
-                {
-                    var arrayTypeSyntax = (ArrayTypeSyntax) GetTypeSyntax(typeSymbol);
-                    arrayTypeSyntax = arrayTypeSyntax.WithRankSpecifiers(rankSpecifiersWithSizes);
+                var arrayTypeSyntax = ((ArrayTypeSyntax)GetTypeSyntax(typeSymbol)).WithRankSpecifiers(rankSpecifiersWithSizes);
+                if (rankSpecifiersWithSizes.SelectMany(ars => ars.Sizes).Any(e => !e.IsKind(CSSyntaxKind.OmittedArraySizeExpression))) {
                     initializer = SyntaxFactory.ArrayCreationExpression(arrayTypeSyntax);
+                } else if (initializer is ImplicitArrayCreationExpressionSyntax iaces && iaces.Initializer != null) {
+                    initializer = SyntaxFactory.ArrayCreationExpression(arrayTypeSyntax, iaces.Initializer);
                 }
             }
 

Tests/CSharp/StatementTests/StatementTests.cs

@@ -822,6 +822,39 @@ private void TestMethod()
 }");
         }
 
+        [Fact]
+        public async Task Issue554_AvoidImplicitArrayTypeAsync()
+        {
+            await TestConversionVisualBasicToCSharpAsync(@"Imports System.Net
+Imports System.Net.Sockets
+
+Public Class Issue554_ImplicitArrayType
+    Public Shared Sub Main()
+        Dim msg() As Byte = {2}
+        Dim ep As IPEndPoint = New IPEndPoint(IPAddress.Loopback, 1434)
+        Dim l_socket As Socket = New Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp)
+        Dim i_Test, i_Tab(), bearb(,) As Integer
+        l_socket.SendTo(msg, ep)
+    End Sub
+End Class"
+                , @"using System.Net;
+using System.Net.Sockets;
+
+public partial class Issue554_ImplicitArrayType
+{
+    public static void Main()
+    {
+        var msg = new byte[] { 2 };
+        var ep = new IPEndPoint(IPAddress.Loopback, 1434);
+        var l_socket = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
+        int i_Test;
+        int[] i_Tab;
+        int[,] bearb;
+        l_socket.SendTo(msg, ep);
+    }
+}");
+        }
+
         [Fact]
         public async Task ArrayInitializationStatementWithLengthAsync()
         {
@@ -1197,16 +1230,13 @@ public static void Main()
         [Fact]
         public async Task SplitArrayDeclarationsAsync()
         {
-            await TestConversionVisualBasicToCSharpAsync($@"Imports System.Diagnostics
-Imports System.Threading
-
-Public Class AcmeClass
+            await TestConversionVisualBasicToCSharpAsync($@"Public Class SplitArrayDeclarations
     Public Shared Sub Main()
         Dim i_Test, i_Tab(), bearb(,) As Integer
     End Sub
 End Class"
                 , @"
-public partial class AcmeClass
+public partial class SplitArrayDeclarations
 {
     public static void Main()
     {