Apply to additional declarations - fixes #1053

Note: Also removed other changelog item which was broken and fixed within this release

Author: GrahamTheCoder

CHANGELOG.md

@@ -10,7 +10,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 ### VB -> C#
 
-* Avoid stack overflow in stack overflow prevention code [#1047](https://github.com/icsharpcode/CodeConverter/issues/1047)
+* Ensure static declarations within property setters are converted [#1053](https://github.com/icsharpcode/CodeConverter/issues/1053)
 * Convert optional DateTime parameters [#1056](https://github.com/icsharpcode/CodeConverter/issues/1056)
 * Convert optional parameters before ref parameters using attributes to avoid compile error [#1057](https://github.com/icsharpcode/CodeConverter/issues/1057)
 * Remove square brackets when escaping labels and identifiers [#1043](https://github.com/icsharpcode/CodeConverter/issues/1043) and [#1044](https://github.com/icsharpcode/CodeConverter/issues/1044)

CodeConverter/CSharp/DeclarationNodeVisitor.cs

@@ -221,10 +221,10 @@ private async Task<IEnumerable<MemberDeclarationSyntax>> ConvertMembersAsync(VBS
             var convertedMembers = await members.SelectManyAsync(async member => {
                 _typeContext.PerScopeState.PushScope();
                 try {
-                    var convertedMember = (await ConvertMemberAsync(member)).Yield();
-                    var convertedPlusAdditional = (await _typeContext.PerScopeState.CreateVbStaticFieldsAsync(
+                    var convertedMember = (await ConvertMemberAsync(member)).Yield().Concat(GetAdditionalDeclarations(member));
+                    IEnumerable<MemberDeclarationSyntax> convertedPlusAdditional = (await _typeContext.PerScopeState.CreateVbStaticFieldsAsync(
                             parentType, namedTypeSymbol, convertedMember, _generatedNames, _semanticModel)
-                        ).Concat(GetAdditionalDeclarations(member));
+                        );
                     return convertedPlusAdditional;
                 }
                 finally

Tests/CSharp/MemberTests/MemberTests.cs

@@ -608,6 +608,42 @@ public virtual int RenamedWriteOnlyProperty
 }");
     }
 
+    [Fact]
+    public async Task SetterProperty1053Async()
+    {
+        await TestConversionVisualBasicToCSharpAsync(
+            @"
+Public Property Prop(ByVal i As Integer) As String
+    Get
+        Static bGet As Boolean
+        bGet = False
+    End Get
+
+    Set(ByVal s As String)
+        Static bSet As Boolean
+        bSet = False
+    End Set
+End Property
+", @"
+internal partial class SurroundingClass
+{
+    private bool _Prop_bGet;
+    private bool _Prop_bSet;
+
+    public string get_Prop(int i)
+    {
+        _Prop_bGet = false;
+        return default;
+    }
+
+    public void set_Prop(int i, string value)
+    {
+        _Prop_bSet = false;
+    }
+
+}", incompatibleWithAutomatedCommentTesting: true);// Known bug: Additional declarations don't get comments correctly converted
+    }
+
     [Fact]
     public async Task TestReadOnlyAndWriteOnlyParametrizedPropertyAsync()
     {