Pass through comparison and use invocation style

Author: GrahamTheCoder

CodeConverter/CSharp/CommonConversions.cs

@@ -41,6 +41,8 @@ internal class CommonConversions
         public Document Document { get; }
         private readonly SemanticModel _semanticModel;
         public SyntaxGenerator CsSyntaxGenerator { get; }
+        public VisualBasicEqualityComparison VisualBasicEqualityComparison { get; }
+
         private readonly CSharpCompilation _csCompilation;
         private readonly ITypeContext _typeContext;
 
@@ -49,14 +51,15 @@ internal class CommonConversions
 
         public CommonConversions(Document document, SemanticModel semanticModel,
             TypeConversionAnalyzer typeConversionAnalyzer, SyntaxGenerator csSyntaxGenerator,
-            CSharpCompilation csCompilation, ITypeContext typeContext)
+            CSharpCompilation csCompilation, ITypeContext typeContext, VisualBasicEqualityComparison visualBasicEqualityComparison)
         {
             TypeConversionAnalyzer = typeConversionAnalyzer;
             Document = document;
             _semanticModel = semanticModel;
             CsSyntaxGenerator = csSyntaxGenerator;
             _csCompilation = csCompilation;
             _typeContext = typeContext;
+            VisualBasicEqualityComparison = visualBasicEqualityComparison;
         }
 
         public async Task<(IReadOnlyCollection<(VariableDeclarationSyntax Decl, ITypeSymbol Type)> Variables, IReadOnlyCollection<CSharpSyntaxNode> Methods)> SplitVariableDeclarationsAsync(

CodeConverter/CSharp/DeclarationNodeVisitor.cs

@@ -61,7 +61,7 @@ public DeclarationNodeVisitor(Document document, Compilation compilation, Semant
             TriviaConvertingDeclarationVisitor = new CommentConvertingVisitorWrapper(this, _semanticModel.SyntaxTree);
             var expressionEvaluator = new ExpressionEvaluator(semanticModel, _visualBasicEqualityComparison);
             var typeConversionAnalyzer = new TypeConversionAnalyzer(semanticModel, csCompilation, _extraUsingDirectives, _csSyntaxGenerator, expressionEvaluator);
-            CommonConversions = new CommonConversions(document, semanticModel, typeConversionAnalyzer, csSyntaxGenerator, csCompilation, _typeContext);
+            CommonConversions = new CommonConversions(document, semanticModel, typeConversionAnalyzer, csSyntaxGenerator, csCompilation, _typeContext, _visualBasicEqualityComparison);
             var expressionNodeVisitor = new ExpressionNodeVisitor(semanticModel, _visualBasicEqualityComparison, csCompilation, _typeContext, CommonConversions, _extraUsingDirectives);
             _triviaConvertingExpressionVisitor = expressionNodeVisitor.TriviaConvertingExpressionVisitor;
             _createMethodBodyVisitorAsync = expressionNodeVisitor.CreateMethodBodyVisitorAsync;

CodeConverter/CSharp/TypeConversionAnalyzer.cs

@@ -59,7 +59,7 @@ public ExpressionSyntax AddExplicitConversion(Microsoft.CodeAnalysis.VisualBasic
 
         public (ExpressionSyntax Expr, bool IsConst) AddExplicitConversion(Microsoft.CodeAnalysis.VisualBasic.Syntax.ExpressionSyntax vbNode, ExpressionSyntax csNode, TypeConversionKind conversionKind, bool addParenthesisIfNeeded = false, bool requiresConst = false, ITypeSymbol forceSourceType = null, ITypeSymbol forceTargetType = null)
         {
-            var typeInfo = ModelExtensions.GetTypeInfo(_semanticModel, vbNode);
+            var typeInfo = _semanticModel.GetTypeInfo(vbNode);
             var vbType = forceSourceType ?? typeInfo.Type;
             var vbConvertedType = forceTargetType ?? typeInfo.ConvertedType;
             bool resultConst = false;