Get identifier specifically from each type rather than including random trivia

GrahamTheCoder · GrahamTheCoder · commit 98bbddd09c58 · 2021-02-07T15:06:18.000Z
diff --git a/CodeConverter/CSharp/DeclarationNodeVisitor.cs b/CodeConverter/CSharp/DeclarationNodeVisitor.cs
@@ -628,8 +628,12 @@ string GetCSharpIdentifierText(VBSyntax.EventContainerSyntax p)
                         return "base";
                     case VBSyntax.KeywordEventContainerSyntax _:
                         return "this";
+                    case VBSyntax.WithEventsEventContainerSyntax weecs:
+                        return CommonConversions.CsEscapedIdentifier(weecs.Identifier.Text).Text;
+                    case VBSyntax.WithEventsPropertyEventContainerSyntax wepecs:
+                        return CommonConversions.CsEscapedIdentifier(wepecs.Property.Identifier.Text).Text;
                     default:
-                        return CommonConversions.CsEscapedIdentifier(p.GetText().ToString().Trim()).Text;
+                        throw new ArgumentOutOfRangeException(nameof(p), p, $"Unrecognized event container: `{p}`");
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -628,8 +628,12 @@ string GetCSharpIdentifierText(VBSyntax.EventContainerSyntax p)`
`628`	`628`	`return "base";`
`629`	`629`	`case VBSyntax.KeywordEventContainerSyntax _:`
`630`	`630`	`return "this";`
	`631`	`+ case VBSyntax.WithEventsEventContainerSyntax weecs:`
	`632`	`+ return CommonConversions.CsEscapedIdentifier(weecs.Identifier.Text).Text;`
	`633`	`+ case VBSyntax.WithEventsPropertyEventContainerSyntax wepecs:`
	`634`	`+ return CommonConversions.CsEscapedIdentifier(wepecs.Property.Identifier.Text).Text;`
`631`	`635`	`default:`
`632`		`- return CommonConversions.CsEscapedIdentifier(p.GetText().ToString().Trim()).Text;`
	`636`	+ throw new ArgumentOutOfRangeException(nameof(p), p, $"Unrecognized event container: `{p}`");
`633`	`637`	`}`
`634`	`638`	`}`
`635`	`639`	`}`