Automatically fix the casing of identifiers where possible

Closes #258
icsharpcode · Apr 8, 2019 · 66a80de · 66a80de
1 parent 0e69b67
commit 66a80de
Show file tree

Hide file tree

Showing 6 changed files with 1,471 additions and 1,438 deletions.
diff --git a/ICSharpCode.CodeConverter/CSharp/CommonConversions.cs b/ICSharpCode.CodeConverter/CSharp/CommonConversions.cs
@@ -274,7 +274,7 @@ private string ConvertNumericLiteralValueText(string textForUser, object value)
             return value.ToString();
         }
 
-        public SyntaxToken ConvertIdentifier(SyntaxToken id, bool isAttribute = false)
+        public SyntaxToken ConvertIdentifier(SyntaxToken id, bool isAttribute = false, bool updateCase = false)
         {
             string text = id.ValueText;
 
@@ -285,6 +285,10 @@ public SyntaxToken ConvertIdentifier(SyntaxToken id, bool isAttribute = false)
             if (id.SyntaxTree == _semanticModel.SyntaxTree) {
                 var symbol = _semanticModel.GetSymbolInfo(id.Parent).Symbol;
                 if (symbol != null && !string.IsNullOrWhiteSpace(symbol.Name)) {
+                    if (updateCase && text.Equals(symbol.Name, StringComparison.OrdinalIgnoreCase)) {
+                        text = symbol.Name;
+                    }
+
                     if (symbol.IsConstructor() && isAttribute) {
                         text = symbol.ContainingType.Name;
                         if (text.EndsWith("Attribute", StringComparison.OrdinalIgnoreCase))

diff --git a/ICSharpCode.CodeConverter/CSharp/NodesVisitor.cs b/ICSharpCode.CodeConverter/CSharp/NodesVisitor.cs
@@ -1298,9 +1298,9 @@ public override CSharpSyntaxNode VisitQueryExpression(VBSyntax.QueryExpressionSy
                 return _queryConverter.ConvertClauses(node.Clauses);
             }
 
-            private SyntaxToken ConvertIdentifier(SyntaxToken identifierIdentifier, bool isAttribute = false)
+            private SyntaxToken ConvertIdentifier(SyntaxToken identifierIdentifier, bool isAttribute = false, bool updateCase = false)
             {
-                return CommonConversions.ConvertIdentifier(identifierIdentifier, isAttribute);
+                return CommonConversions.ConvertIdentifier(identifierIdentifier, isAttribute, updateCase);
             }
 
             public override CSharpSyntaxNode VisitOrdering(VBSyntax.OrderingSyntax node)
@@ -1630,7 +1630,7 @@ public override CSharpSyntaxNode VisitTypeConstraint(VBSyntax.TypeConstraintSynt
 
             public override CSharpSyntaxNode VisitIdentifierName(VBSyntax.IdentifierNameSyntax node)
             {
-                var identifier = SyntaxFactory.IdentifierName(ConvertIdentifier(node.Identifier, node.GetAncestor<VBSyntax.AttributeSyntax>() != null));
+                var identifier = SyntaxFactory.IdentifierName(ConvertIdentifier(node.Identifier, node.GetAncestor<VBSyntax.AttributeSyntax>() != null, updateCase: true));
 
                 return !node.Parent.IsKind(VBasic.SyntaxKind.SimpleMemberAccessExpression, VBasic.SyntaxKind.QualifiedName, VBasic.SyntaxKind.NameColonEquals, VBasic.SyntaxKind.ImportsStatement, VBasic.SyntaxKind.NamespaceStatement, VBasic.SyntaxKind.NamedFieldInitializer)
                                     || node.Parent is VBSyntax.MemberAccessExpressionSyntax maes && maes.Expression == node

diff --git a/...ta/VBToCSCharacterization/ConvertSolution/WindowsAppVb/My Project/Application.Designer.cs b/...ta/VBToCSCharacterization/ConvertSolution/WindowsAppVb/My Project/Application.Designer.cs