Change the name to avoid #569

Author: GrahamTheCoder

CodeConverter/CSharp/CommonConversions.cs

@@ -319,6 +319,7 @@ private static string WithDeclarationCasing(SyntaxToken id, ISymbol idSymbol, st
 
         /// <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)
         {

CodeConverter/CSharp/DeclarationNodeVisitor.cs

@@ -209,7 +209,7 @@ private async Task<IEnumerable<MemberDeclarationSyntax>> ConvertMembersAsync(VBS
                 var constructorFieldInitializersFromOtherParts = GetConstructorFieldInitializersFromOtherParts(namedTypeSymbol);
                 additionalInitializers.AdditionalInstanceInitializers.AddRange(constructorFieldInitializersFromOtherParts);
                 if (requiresInitializeComponent) {
-                    // Constructor event handlers not required since they'll be inside InitializeComponent
+                    // Constructor event handlers not required since they'll be inside InitializeComponent - see other use of IsDesignerGeneratedTypeWithInitializeComponent
                     directlyConvertedMembers = directlyConvertedMembers.Concat(methodsWithHandles.CreateDelegatingMethodsRequiredByInitializeComponent());
                 } else {
                     additionalInitializers.AdditionalInstanceInitializers.AddRange(methodsWithHandles.GetConstructorEventHandlers());
@@ -929,6 +929,7 @@ public override async Task<CSharpSyntaxNode> VisitMethodBlock(VBSyntax.MethodBlo
             var visualBasicSyntaxVisitor = await CreateMethodBodyVisitorAsync(node, node.IsIterator(), csReturnVariableOrNull);
             var convertedStatements = await ConvertStatementsAsync(node.Statements, visualBasicSyntaxVisitor);
 
+            //  Just class events - for property events, see other use of IsDesignerGeneratedTypeWithInitializeComponent
             if (node.SubOrFunctionStatement.Identifier.Text == "InitializeComponent" && node.SubOrFunctionStatement.IsKind(VBasic.SyntaxKind.SubStatement) && declaredSymbol.ContainingType.IsDesignerGeneratedTypeWithInitializeComponent(_vbCompilation)) {
                 var firstResumeLayout = convertedStatements.Statements.FirstOrDefault(IsThisResumeLayoutInvocation) ?? convertedStatements.Statements.Last();
                 convertedStatements = convertedStatements.InsertNodesBefore(firstResumeLayout, _typeContext.MethodsWithHandles.GetInitializeComponentClassEventHandlers());

CodeConverter/CSharp/ExpressionNodeVisitor.cs

@@ -272,7 +272,20 @@ public override async Task<CSharpSyntaxNode> VisitLiteralExpression(VBasic.Synta
             if (TypeConversionAnalyzer.ConvertStringToCharLiteral(node, typeInfo.Type, convertedType, out char chr)) {
                 return CommonConversions.Literal(chr);
             }
-            return CommonConversions.Literal(node.Token.Value, node.Token.Text, convertedType);
+
+
+            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 + "\"";
+            }
+
+            return CommonConversions.Literal(val, text, convertedType);
         }
 
         public override async Task<CSharpSyntaxNode> VisitInterpolation(VBasic.Syntax.InterpolationSyntax node)

Tests/CSharp/MemberTests/EventMemberTests.cs

@@ -533,7 +533,7 @@ public void InitializeComponent()
         // POW_btnV2DBM
         // 
         _POW_btnV2DBM.Location = new System.Drawing.Point(207, 15);
-        _POW_btnV2DBM.Name = ""POW_btnV2DBM"";
+        _POW_btnV2DBM.Name = ""_POW_btnV2DBM"";
         _POW_btnV2DBM.Size = new System.Drawing.Size(42, 23);
         _POW_btnV2DBM.TabIndex = 3;
         _POW_btnV2DBM.Text = "">>"";