Merge pull request #22 from GrahamTheCoder/fix-redim-preserve-property-1508587937501568863

Fix ReDim Preserve on property generating invalid ref code

Author: GrahamTheCoder

CodeConverter/CSharp/MethodBodyExecutableStatementVisitor.cs

@@ -320,8 +320,18 @@ private async Task<SyntaxList<StatementSyntax>> ConvertRedimClauseAsync(VBSyntax
         var csTargetArrayExpression = await node.Expression.AcceptAsync<ExpressionSyntax>(_expressionVisitor);
         var convertedBounds = (await CommonConversions.ConvertArrayBoundsAsync(node.ArrayBounds)).Sizes.ToList();
         if (preserve && convertedBounds.Count == 1) {
-            var argumentList = new[] { csTargetArrayExpression, convertedBounds.Single() }.CreateCsArgList(SyntaxKind.RefKeyword);
+            bool isProperty = _semanticModel.GetSymbolInfo(node.Expression).Symbol?.IsKind(SymbolKind.Property) == true;
+            var arrayToResize = isProperty ? CreateLocalVariableWithUniqueName(node.Expression, "arg" + csTargetArrayExpression.ToString().Split('.').Last(), csTargetArrayExpression) : default;
+            var resizeArg = isProperty ? (ExpressionSyntax)arrayToResize.Reference : csTargetArrayExpression;
+
+            var argumentList = new[] { resizeArg, convertedBounds.Single() }.CreateCsArgList(SyntaxKind.RefKeyword);
             var arrayResize = SyntaxFactory.InvocationExpression(ValidSyntaxFactory.MemberAccess(nameof(Array), nameof(Array.Resize)), argumentList);
+
+            if (isProperty) {
+                var assignment = SyntaxFactory.AssignmentExpression(SyntaxKind.SimpleAssignmentExpression, csTargetArrayExpression, arrayToResize.Reference);
+                return SyntaxFactory.List(new StatementSyntax[] { arrayToResize.Declaration, SyntaxFactory.ExpressionStatement(arrayResize), SyntaxFactory.ExpressionStatement(assignment) });
+            }
+
             return SingleStatement(arrayResize);
         }
         var newArrayAssignment = CreateNewArrayAssignment(node.Expression, csTargetArrayExpression, convertedBounds);

Tests/CSharp/StatementTests/RedimPreserveTests.cs

@@ -0,0 +1,33 @@
+using System.Threading.Tasks;
+using ICSharpCode.CodeConverter.Tests.TestRunners;
+using Xunit;
+
+namespace ICSharpCode.CodeConverter.Tests.CSharp.StatementTests;
+
+public class RedimPreserveTests : ConverterTestBase
+{
+    [Fact]
+    public async Task RedimPreserveOnPropertyAsync()
+    {
+        await TestConversionVisualBasicToCSharpAsync(
+            @"Public Class TestClass
+    Public Property NumArray1 As Integer()
+
+    Public Sub New()
+        ReDim Preserve NumArray1(4)
+    End Sub
+End Class", @"using System;
+
+public partial class TestClass
+{
+    public int[] NumArray1 { get; set; }
+
+    public TestClass()
+    {
+        var argNumArray1 = NumArray1;
+        Array.Resize(ref argNumArray1, 5);
+        NumArray1 = argNumArray1;
+    }
+}");
+    }
+}