Slightly simplify by removing parameter

Author: GrahamTheCoder

CodeConverter/CSharp/DeclarationNodeVisitor.cs

@@ -200,40 +200,48 @@ private async Task<IEnumerable<MemberDeclarationSyntax>> ConvertMembersAsync(VBS
             var methodsWithHandles = MethodsWithHandles.Create(GetMethodWithHandles(parentType));
 
             if (methodsWithHandles.Any()) _extraUsingDirectives.Add("System.Runtime.CompilerServices");//For MethodImplOptions.Synchronized
+            
+            _typeContext.Push(methodsWithHandles, additionalInitializers);
+            try {
+                var convertedMembers = (await members.SelectManyAsync(async member =>
+                        (await ConvertMemberAsync(member)).Yield().Concat(GetAdditionalDeclarations(member)))
+                    );
 
-            IEnumerable<MemberDeclarationSyntax> directlyConvertedMembers = await GetDirectlyConvertedMembers(additionalInitializers, methodsWithHandles);
-
-            var requiresInitializeComponent = namedTypeSymbol.IsDesignerGeneratedTypeWithInitializeComponent(_vbCompilation);
-
-            if (shouldAddTypeWideInitToThisPart) {
-                var otherPartsOfType = GetAllPartsOfType(parentType, namedTypeSymbol).ToArray();
-                var constructorFieldInitializersFromOtherParts = otherPartsOfType
-                    .Where(t => (!Equals(t.Type.SyntaxTree.FilePath, _semanticModel.SyntaxTree.FilePath) || !t.Type.Span.Equals(parentType.Span)))
-                    .SelectMany(r => GetFieldsIdentifiersWithInitializer(r.Type, r.SemanticModel));
-                additionalInitializers.AdditionalInstanceInitializers.AddRange(constructorFieldInitializersFromOtherParts);
-                if (requiresInitializeComponent) {
-                    // Constructor event handlers not required since they'll be inside InitializeComponent - see other use of IsDesignerGeneratedTypeWithInitializeComponent
-                    directlyConvertedMembers = directlyConvertedMembers
-                        .Concat(methodsWithHandles.CreateDelegatingMethodsRequiredByInitializeComponent());
-                    additionalInitializers.AdditionalInstanceInitializers
-                        .AddRange(CommonConversions.WinformsConversions.GetNameAssignments(methodsWithHandles, otherPartsOfType));
-                } else {
-                    additionalInitializers.AdditionalInstanceInitializers.AddRange(methodsWithHandles.GetConstructorEventHandlers());
-                }
+                return WithAdditionalMembers(convertedMembers).ToArray();//Ensure evaluated before popping type context
+            } finally {
+                _typeContext.Pop();
             }
 
-            return additionalInitializers.WithAdditionalInitializers(namedTypeSymbol, directlyConvertedMembers.ToList(), CommonConversions.ConvertIdentifier(parentType.BlockStatement.Identifier), requiresInitializeComponent);
-
-            async Task<MemberDeclarationSyntax[]> GetDirectlyConvertedMembers(AdditionalInitializers additionalInitializers, MethodsWithHandles methodsWithHandles)
+            IEnumerable<MemberDeclarationSyntax> WithAdditionalMembers(IEnumerable<MemberDeclarationSyntax> convertedMembers)
             {
-                _typeContext.Push(methodsWithHandles, additionalInitializers);
-                try {
-                    var convertedMembers = await members.SelectManyAsync(async member =>
-                        new[] { await ConvertMemberAsync(member) }.Concat(GetAdditionalDeclarations(member)));
-                    return convertedMembers.ToArray();
-                } finally {
-                    _typeContext.Pop();
+                var requiresInitializeComponent = namedTypeSymbol.IsDesignerGeneratedTypeWithInitializeComponent(_vbCompilation);
+
+                if (shouldAddTypeWideInitToThisPart)
+                {
+                    var otherPartsOfType = GetAllPartsOfType(parentType, namedTypeSymbol).ToArray();
+                    var constructorFieldInitializersFromOtherParts = otherPartsOfType
+                        .Where(t => (!Equals(t.Type.SyntaxTree.FilePath, _semanticModel.SyntaxTree.FilePath) ||
+                                     !t.Type.Span.Equals(parentType.Span)))
+                        .SelectMany(r => GetFieldsIdentifiersWithInitializer(r.Type, r.SemanticModel));
+                    additionalInitializers.AdditionalInstanceInitializers.AddRange(constructorFieldInitializersFromOtherParts);
+                    if (requiresInitializeComponent)
+                    {
+                        // Constructor event handlers not required since they'll be inside InitializeComponent - see other use of IsDesignerGeneratedTypeWithInitializeComponent
+                        convertedMembers = convertedMembers
+                            .Concat(methodsWithHandles.CreateDelegatingMethodsRequiredByInitializeComponent());
+                        additionalInitializers.AdditionalInstanceInitializers
+                            .AddRange(
+                                CommonConversions.WinformsConversions.GetNameAssignments(otherPartsOfType));
+                    }
+                    else
+                    {
+                        additionalInitializers.AdditionalInstanceInitializers.AddRange(methodsWithHandles
+                            .GetConstructorEventHandlers());
+                    }
                 }
+
+                return additionalInitializers.WithAdditionalInitializers(namedTypeSymbol, convertedMembers.ToList(),
+                    CommonConversions.ConvertIdentifier(parentType.BlockStatement.Identifier), requiresInitializeComponent);
             }
         }
 

CodeConverter/CSharp/ExpressionNodeVisitor.cs

@@ -269,7 +269,7 @@ public override async Task<CSharpSyntaxNode> VisitLiteralExpression(VBasic.Synta
 
             var val = node.Token.Value;
             var text = node.Token.Text;
-            if (_typeContext.Any() && CommonConversions.WinformsConversions.ShouldPrefixAssignedNameWithUnderscore(node.Parent as VBSyntax.AssignmentStatementSyntax, _typeContext.MethodsWithHandles) && val is string valStr) {
+            if (_typeContext.Any() && CommonConversions.WinformsConversions.ShouldPrefixAssignedNameWithUnderscore(node.Parent as VBSyntax.AssignmentStatementSyntax) && val is string valStr) {
                 val = "_" + valStr;
                 text = "\"_" + valStr + "\"";
             }

CodeConverter/CSharp/WinformsConversions.cs

@@ -38,35 +38,20 @@ private static bool IsInitializeComponent(VBSyntax.MethodBlockSyntax methodBlock
             return methodBlockSyntax?.SubOrFunctionStatement.Identifier.Text == "InitializeComponent";
         }
 
-        /// <summary>
-        /// We replace a field with a property to handle event subscription, so need to update the name so the winforms designer regenerates the file correctly in future
-        /// </summary>
-        public bool ShouldPrefixAssignedNameWithUnderscore(VBSyntax.StatementSyntax statementOrNull, MethodsWithHandles typeContextMethodsWithHandles)
-        {
-            return statementOrNull is VBSyntax.AssignmentStatementSyntax assignment && InMethodCalledInitializeComponent(assignment) &&
-                            assignment.Left is VBSyntax.MemberAccessExpressionSyntax maes &&
-                                !(maes.Expression is VBSyntax.MeExpressionSyntax) &&
-                            maes.Name.ToString() == "Name" && 
-                            maes.Expression.LastOrDefaultDescendant<VBSyntax.IdentifierNameSyntax>()?.Identifier.Text is {} propName &&
-                            typeContextMethodsWithHandles.AnyForPropertyName(propName);
-        }
-
-        public IEnumerable<Assignment> GetNameAssignments(MethodsWithHandles typeContextMethodsWithHandles,
-            (VBSyntax.TypeBlockSyntax Type, SemanticModel SemanticModel)[] otherPartsOfType)
+        public IEnumerable<Assignment> GetNameAssignments((VBSyntax.TypeBlockSyntax Type, SemanticModel SemanticModel)[] otherPartsOfType)
         {
             return otherPartsOfType.SelectMany(typePart => 
                 typePart.Type.Members.OfType<VBSyntax.MethodBlockSyntax>()
                     .Where(IsInitializeComponent)
-                    .SelectMany(syntax => GetAssignments(typeContextMethodsWithHandles, syntax))
+                    .SelectMany(GetAssignments)
             );
         }
 
-        private IEnumerable<Assignment> GetAssignments(MethodsWithHandles typeContextMethodsWithHandles,
-            VBSyntax.MethodBlockSyntax initializeComponent)
+        private IEnumerable<Assignment> GetAssignments(VBSyntax.MethodBlockSyntax initializeComponent)
         {
             return initializeComponent.Statements
                 .OfType<VBSyntax.AssignmentStatementSyntax>()
-                .Where(syntax => ShouldPrefixAssignedNameWithUnderscore(syntax, typeContextMethodsWithHandles))
+                .Where(ShouldPrefixAssignedNameWithUnderscore)
                 .Select(s => (s.Left as VBSyntax.MemberAccessExpressionSyntax)?.Expression.LastOrDefaultDescendant<VBSyntax.IdentifierNameSyntax>())
                 .Where(s => s != null)
                 .Select(id => {
@@ -75,5 +60,20 @@ private IEnumerable<Assignment> GetAssignments(MethodsWithHandles typeContextMet
                     return new Assignment(nameAccess, SyntaxKind.SimpleAssignmentExpression, originalRuntimeNameToRestore, true);
                 });
         }
+
+        /// <summary>
+        /// We replace a field with a property to handle event subscription, so need to update the name so the winforms designer regenerates the file correctly in future
+        /// </summary>
+        public bool ShouldPrefixAssignedNameWithUnderscore(VBSyntax.StatementSyntax statementOrNull)
+        {
+            return statementOrNull is VBSyntax.AssignmentStatementSyntax assignment &&
+                   _typeContext.Any() &&
+                   InMethodCalledInitializeComponent(assignment) &&
+                   assignment.Left is VBSyntax.MemberAccessExpressionSyntax maes &&
+                   maes.Name.Identifier.Text == "Name" &&
+                   !(maes.Expression is VBSyntax.MeExpressionSyntax) &&
+                   maes.Expression.LastOrDefaultDescendant<VBSyntax.IdentifierNameSyntax>()?.Identifier.Text is {} propName &&
+                   _typeContext.MethodsWithHandles.AnyForPropertyName(propName);
+        }
     }
 }