Pass type symbol

Author: GrahamTheCoder

CodeConverter/CSharp/CommonConversions.cs

@@ -57,7 +57,7 @@ public CommonConversions(Document document, SemanticModel semanticModel,
             _csCompilation = csCompilation;
         }
 
-        public async Task<(IReadOnlyCollection<VariableDeclarationSyntax> Variables, IReadOnlyCollection<CSharpSyntaxNode> Methods)> SplitVariableDeclarations(
+        public async Task<(IReadOnlyCollection<(VariableDeclarationSyntax Decl, ITypeSymbol Type)> Variables, IReadOnlyCollection<CSharpSyntaxNode> Methods)> SplitVariableDeclarations(
             VariableDeclaratorSyntax declarator, bool preferExplicitType = false)
         {
             var vbInitValue = GetInitializerToConvert(declarator);
@@ -75,7 +75,7 @@ public CommonConversions(Document document, SemanticModel semanticModel,
                 requireExplicitTypeForAll |= vbInitIsNothingLiteral || isAnonymousFunction;
             }
 
-            var csVars = new Dictionary<string, VariableDeclarationSyntax>();
+            var csVars = new Dictionary<string, (VariableDeclarationSyntax Decl, ITypeSymbol Type)>();
             var csMethods = new List<CSharpSyntaxNode>();
 
             foreach (var name in declarator.Names) {
@@ -87,15 +87,15 @@ public CommonConversions(Document document, SemanticModel semanticModel,
                 string k = declaredSymbolType?.GetFullMetadataName() ?? name.ToString();//Use likely unique key if the type symbol isn't available
 
                 if (csVars.TryGetValue(k, out var decl)) {
-                    csVars[k] = decl.AddVariables(v);
+                    csVars[k] = (decl.Decl.AddVariables(v), decl.Type);
                     continue;
                 }
 
                 if (initializerOrMethodDecl == null || initializerOrMethodDecl is ExpressionSyntax) {
                     var variableDeclaration = CreateVariableDeclaration(declarator, preferExplicitType,
                         requireExplicitTypeForAll, vbInitializerType, declaredSymbolType, equalsValueClauseSyntax,
                         initSymbol, v);
-                    csVars[k] = variableDeclaration;
+                    csVars[k] = (variableDeclaration, declaredSymbolType);
                 } else {
                     csMethods.Add(initializerOrMethodDecl);
                 }

CodeConverter/CSharp/DeclarationNodeVisitor.cs

@@ -474,10 +474,10 @@ private async Task<List<MemberDeclarationSyntax>> GetMemberDeclarations(VBSyntax
             return declarations;
         }
 
-        private IEnumerable<MemberDeclarationSyntax> CreateMemberDeclarations(IReadOnlyCollection<VariableDeclarationSyntax> splitDeclarationVariables,
+        private IEnumerable<MemberDeclarationSyntax> CreateMemberDeclarations(IReadOnlyCollection<(VariableDeclarationSyntax Decl, ITypeSymbol Type)> splitDeclarationVariables,
             bool isWithEvents, SyntaxTokenList convertedModifiers, List<AttributeListSyntax> attributes)
         {
-            foreach (var decl in splitDeclarationVariables)
+            foreach (var (decl, type) in splitDeclarationVariables)
             {
                 if (isWithEvents) {
                     var fieldDecls = CreateWithEventsMembers(convertedModifiers, attributes, decl);
@@ -488,8 +488,8 @@ private IEnumerable<MemberDeclarationSyntax> CreateMemberDeclarations(IReadOnlyC
                         foreach (var additionalDecl in CreateAdditionalLocalMembers(convertedModifiers, attributes, decl)) {
                             yield return additionalDecl;
                         }
-                    } else
-                    {
+                    } else {
+
                         yield return SyntaxFactory.FieldDeclaration(SyntaxFactory.List(attributes), convertedModifiers, decl);
                     }
 

CodeConverter/CSharp/MethodBodyExecutableStatementVisitor.cs

@@ -90,7 +90,7 @@ public override async Task<SyntaxList<StatementSyntax>> VisitLocalDeclarationSta
 
             foreach (var declarator in node.Declarators) {
                 var splitVariableDeclarations = await CommonConversions.SplitVariableDeclarations(declarator, preferExplicitType: isConst);
-                var localDeclarationStatementSyntaxs = splitVariableDeclarations.Variables.Select(decl => SyntaxFactory.LocalDeclarationStatement(modifiers, decl));
+                var localDeclarationStatementSyntaxs = splitVariableDeclarations.Variables.Select(declAndType => SyntaxFactory.LocalDeclarationStatement(modifiers, declAndType.Decl));
                 declarations.AddRange(localDeclarationStatementSyntaxs);
                 var localFunctions = splitVariableDeclarations.Methods.Cast<LocalFunctionStatementSyntax>();
                 declarations.AddRange(localFunctions);
@@ -454,7 +454,7 @@ public override async Task<SyntaxList<StatementSyntax>> VisitForBlock(VBSyntax.F
             var initializers = new List<ExpressionSyntax>();
             if (stmt.ControlVariable is VBSyntax.VariableDeclaratorSyntax) {
                 var v = (VBSyntax.VariableDeclaratorSyntax)stmt.ControlVariable;
-                declaration = (await CommonConversions.SplitVariableDeclarations(v)).Variables.Single();
+                declaration = (await CommonConversions.SplitVariableDeclarations(v)).Variables.Single().Decl;
                 declaration = declaration.WithVariables(SyntaxFactory.SingletonSeparatedList(declaration.Variables[0].WithInitializer(SyntaxFactory.EqualsValueClause(startValue))));
                 id = SyntaxFactory.IdentifierName(declaration.Variables[0].Identifier);
             } else {
@@ -519,7 +519,7 @@ public override async Task<SyntaxList<StatementSyntax>> VisitForEachBlock(VBSynt
             TypeSyntax type;
             SyntaxToken id;
             if (stmt.ControlVariable is VBSyntax.VariableDeclaratorSyntax vds) {
-                var declaration = (await CommonConversions.SplitVariableDeclarations(vds)).Variables.Single();
+                var declaration = (await CommonConversions.SplitVariableDeclarations(vds)).Variables.Single().Decl;
                 type = declaration.Type;
                 id = declaration.Variables.Single().Identifier;
             } else {
@@ -709,7 +709,7 @@ public override async Task<SyntaxList<StatementSyntax>> VisitUsingBlock(VBSyntax
                 StatementSyntax stmt = statementSyntax;
                 foreach (var v in node.UsingStatement.Variables.Reverse())
                 foreach (var declaration in (await CommonConversions.SplitVariableDeclarations(v)).Variables.Reverse())
-                    stmt = SyntaxFactory.UsingStatement(declaration, null, stmt);
+                    stmt = SyntaxFactory.UsingStatement(declaration.Decl, null, stmt);
                 return SingleStatement(stmt);
             }