Tidyups

Author: GrahamTheCoder

CodeConverter/CSharp/CommonConversions.cs

@@ -126,15 +126,15 @@ private async Task<EqualsValueClauseSyntax> ConvertEqualsValueClauseSyntax(
             var csTypeSyntax = GetTypeSyntax(declaredSymbolType);
 
             bool isField = vbDeclarator.Parent.IsKind(SyntaxKind.FieldDeclaration);
-            bool isConst = declaredSymbol is IFieldSymbol fieldSymbol && fieldSymbol.IsConst ||
-                           declaredSymbol is ILocalSymbol localSymbol && localSymbol.IsConst;
+            bool declaredConst = declaredSymbol is IFieldSymbol fieldSymbol && fieldSymbol.IsConst ||
+                                 declaredSymbol is ILocalSymbol localSymbol && localSymbol.IsConst;
 
             EqualsValueClauseSyntax equalsValueClauseSyntax;
             if (await GetInitializerFromNameAndType(declaredSymbolType, vbName, initializerOrMethodDecl) is ExpressionSyntax
                 adjustedInitializerExpr)
             {
                 var convertedInitializer = vbInitValue != null
-                    ? TypeConversionAnalyzer.AddExplicitConversion(vbInitValue, adjustedInitializerExpr, isConst: isConst)
+                    ? TypeConversionAnalyzer.AddExplicitConversion(vbInitValue, adjustedInitializerExpr, isConst: declaredConst)
                     : adjustedInitializerExpr;
                 equalsValueClauseSyntax = SyntaxFactory.EqualsValueClause(convertedInitializer);
             }
@@ -178,7 +178,7 @@ private TypeSyntax GetFuncTypeSyntax(IMethodSymbol method)
 
         public TypeSyntax GetTypeSyntax(ITypeSymbol typeSymbol, bool useImplicitType = false)
         {
-            if (useImplicitType || typeSymbol == null) return CreateVarTypeName();
+            if (useImplicitType || typeSymbol == null) return ValidSyntaxFactory.VarType;
             var syntax = (TypeSyntax)CsSyntaxGenerator.TypeExpression(typeSymbol);
 
             return WithDeclarationCasing(syntax, typeSymbol);
@@ -202,11 +202,6 @@ private static TypeSyntax WithDeclarationCasing(TypeSyntax syntax, ITypeSymbol t
             });
         }
 
-        private static TypeSyntax CreateVarTypeName()
-        {
-            return SyntaxFactory.ParseTypeName("var");
-        }
-
         private static VBSyntax.ExpressionSyntax GetInitializerToConvert(VariableDeclaratorSyntax declarator)
         {
             return declarator.AsClause?.TypeSwitch(
@@ -518,7 +513,7 @@ public static VariableDeclarationSyntax CreateVariableDeclarationAndAssignment(s
         {
             CSSyntax.VariableDeclaratorSyntax variableDeclaratorSyntax = CreateVariableDeclarator(variableName, initValue);
             var variableDeclarationSyntax = SyntaxFactory.VariableDeclaration(
-                explicitType ?? SyntaxFactory.IdentifierName("var"),
+                explicitType ?? ValidSyntaxFactory.VarType,
                 SyntaxFactory.SingletonSeparatedList(variableDeclaratorSyntax));
             return variableDeclarationSyntax;
         }

CodeConverter/CSharp/DeclarationNodeVisitor.cs

@@ -486,8 +486,7 @@ private IEnumerable<MemberDeclarationSyntax> CreateMemberDeclarations(IReadOnlyC
                 if (isWithEvents) {
                     var fieldDecls = CreateWithEventsMembers(convertedModifiers, attributes, decl);
                     foreach (var f in fieldDecls) yield return f;
-                } else
-                {
+                } else {
                     if (_additionalLocals.GetDeclarations().Count() > 0) {
                         foreach (var additionalDecl in CreateAdditionalLocalMembers(convertedModifiers, attributes, decl)) {
                             yield return additionalDecl;
@@ -501,8 +500,6 @@ private IEnumerable<MemberDeclarationSyntax> CreateMemberDeclarations(IReadOnlyC
                         }
                         yield return SyntaxFactory.FieldDeclaration(SyntaxFactory.List(attributes), convertedModifiers, decl);
                     }
-
-                    
                 }
             }
         }

CodeConverter/CSharp/MethodBodyExecutableStatementVisitor.cs

@@ -591,7 +591,7 @@ public override async Task<SyntaxList<StatementSyntax>> VisitForEachBlock(VBSynt
             } else {
                 var v = (IdentifierNameSyntax) await stmt.ControlVariable.AcceptAsync(_expressionVisitor);
                 id = v.Identifier;
-                type = SyntaxFactory.ParseTypeName("var");
+                type = ValidSyntaxFactory.VarType;
             }
 
             var block = SyntaxFactory.Block(statements.Concat(await ConvertStatements(node.Statements)));
@@ -712,7 +712,7 @@ private CasePatternSwitchLabelSyntax WrapInCasePatternSwitchLabelSyntax(VBSyntax
             } else {
                 var varName = CommonConversions.CsEscapedIdentifier(GetUniqueVariableNameInScope(node, "case"));
                 patternMatch = SyntaxFactory.DeclarationPattern(
-                    SyntaxFactory.ParseTypeName("var"), SyntaxFactory.SingleVariableDesignation(varName));
+                    ValidSyntaxFactory.VarType, SyntaxFactory.SingleVariableDesignation(varName));
                 expression = SyntaxFactory.BinaryExpression(SyntaxKind.EqualsExpression, SyntaxFactory.IdentifierName(varName), expression);
             }