Extract logic

Author: GrahamTheCoder

CodeConverter/CSharp/CommonConversions.cs

@@ -283,7 +283,7 @@ public SyntaxToken ConvertIdentifier(SyntaxToken id, bool isAttribute = false, S
                         text = propertyFieldSymbol.AssociatedSymbol.Name;
                     } else if (normalizedText.EndsWith("Event", StringComparison.OrdinalIgnoreCase) && idSymbol is IFieldSymbol eventFieldSymbol && eventFieldSymbol.AssociatedSymbol?.IsKind(SymbolKind.Event) == true) {
                         text = eventFieldSymbol.AssociatedSymbol.Name;
-                    } else if (MustInlinePropertyWithEventsAccess(id.Parent, idSymbol)) {
+                    } else if (WinformsConversions.MustInlinePropertyWithEventsAccess(id.Parent, idSymbol)) {
                         // For C# Winforms designer, we need to use direct field access - see other usage of MustInlinePropertyWithEventsAccess
                         text = "_" + text;
                     }
@@ -317,20 +317,6 @@ private static string WithDeclarationCasing(SyntaxToken id, ISymbol idSymbol, st
             return text;
         }
 
-        /// <remarks>
-        /// Co-ordinates inlining property events, see <see cref="MethodBodyExecutableStatementVisitor.GetPostAssignmentStatements"/>
-        /// Also see usages of IsDesignerGeneratedTypeWithInitializeComponent
-        /// </remarks>
-        public static bool MustInlinePropertyWithEventsAccess(SyntaxNode anyNodePossiblyWithinMethod, ISymbol potentialPropertySymbol)
-        {
-            return InMethodCalledInitializeComponent(anyNodePossiblyWithinMethod) && potentialPropertySymbol is IPropertySymbol prop && prop.IsWithEvents;
-        }
-
-        public static bool InMethodCalledInitializeComponent(SyntaxNode anyNodePossiblyWithinMethod)
-        {
-            return anyNodePossiblyWithinMethod.GetAncestor<VBSyntax.MethodBlockSyntax>()?.SubOrFunctionStatement.Identifier.Text == "InitializeComponent";
-        }
-
         public static SyntaxToken CsEscapedIdentifier(string text)
         {
             if (SyntaxFacts.GetKeywordKind(text) != CSSyntaxKind.None) text = "@" + text;

CodeConverter/CSharp/ExpressionNodeVisitor.cs

@@ -276,13 +276,9 @@ public override async Task<CSharpSyntaxNode> VisitLiteralExpression(VBasic.Synta
 
             var val = node.Token.Value;
             var text = node.Token.Text;
-            if (node.Parent is VBSyntax.AssignmentStatementSyntax assignment && CommonConversions.InMethodCalledInitializeComponent(node.Parent) &&
-                assignment.Left is VBSyntax.MemberAccessExpressionSyntax maes && !(maes.Expression is VBSyntax.MeExpressionSyntax) &&
-                maes.Name.ToString() == "Name" &&
-                val is string valStr) {
-                    // Update name so field is regenerated correctly by winforms designer
-                    val = "_" + valStr;
-                    text = "\"_" + valStr + "\"";
+            if (WinformsConversions.ShouldPrefixAssignedNameWithUnderscore(node.Parent as VBSyntax.AssignmentStatementSyntax) && val is string valStr) {
+                val = "_" + valStr;
+                text = "\"_" + valStr + "\"";
             }
 
             return CommonConversions.Literal(val, text, convertedType);

CodeConverter/CSharp/MethodsWithHandles.cs

@@ -47,7 +47,7 @@ public IEnumerable<MemberDeclarationSyntax> GetDeclarationsForFieldBackedPropert
         /// </summary>
         public SyntaxList<StatementSyntax> GetPostAssignmentStatements(Microsoft.CodeAnalysis.VisualBasic.Syntax.AssignmentStatementSyntax node, ISymbol potentialPropertySymbol)
         {
-            if (CommonConversions.MustInlinePropertyWithEventsAccess(node, potentialPropertySymbol))
+            if (WinformsConversions.MustInlinePropertyWithEventsAccess(node, potentialPropertySymbol))
             {
                 var fieldName = SyntaxFactory.IdentifierName("_" + potentialPropertySymbol.Name);
                 var handledMethods = _handledMethodsFromPropertyWithEventName[potentialPropertySymbol.Name].ToArray();

CodeConverter/CSharp/WinformsConversions.cs

@@ -0,0 +1,36 @@
+using System.Linq;
+using ICSharpCode.CodeConverter.Util;
+using Microsoft.CodeAnalysis;
+using VBSyntax = Microsoft.CodeAnalysis.VisualBasic.Syntax;
+
+namespace ICSharpCode.CodeConverter.CSharp
+{
+    internal static class WinformsConversions
+    {
+        /// <remarks>
+        /// Co-ordinates inlining property events, see <see cref="MethodBodyExecutableStatementVisitor.GetPostAssignmentStatements"/>
+        /// Also see usages of IsDesignerGeneratedTypeWithInitializeComponent
+        /// </remarks>
+        public static bool MustInlinePropertyWithEventsAccess(SyntaxNode anyNodePossiblyWithinMethod, ISymbol potentialPropertySymbol)
+        {
+            return InMethodCalledInitializeComponent(anyNodePossiblyWithinMethod) && potentialPropertySymbol is IPropertySymbol prop && prop.IsWithEvents;
+        }
+
+        public static bool InMethodCalledInitializeComponent(SyntaxNode anyNodePossiblyWithinMethod)
+        {
+            return anyNodePossiblyWithinMethod.GetAncestor<VBSyntax.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>
+        /// <returns></returns>
+        public static bool ShouldPrefixAssignedNameWithUnderscore(VBSyntax.StatementSyntax statementOrNull)
+        {
+            return statementOrNull is VBSyntax.AssignmentStatementSyntax assignment && InMethodCalledInitializeComponent(assignment) &&
+                            assignment.Left is VBSyntax.MemberAccessExpressionSyntax maes &&
+                                !(maes.Expression is VBSyntax.MeExpressionSyntax) &&
+                            maes.Name.ToString() == "Name";
+        }
+    }
+}