Subtle behaviour change: Use bool version rather than late bind

Author: GrahamTheCoder

CodeConverter/CSharp/BuiltInVisualBasicOperatorSubsitutions.cs

@@ -108,6 +108,7 @@ private async Task<ExpressionSyntax> ConvertToObjectBinaryOperatorAsync(VBSyntax
             private async Task<ExpressionSyntax> ConvertToObjectComparisonOperatorAsync(VBSyntax.BinaryExpressionSyntax node, KnownMethod member)
             {
                 var (lhs, rhs) = await AcceptSidesAsync(node);
+                member = (member.Import, member.TypeName, "Conditional" + member.MethodName); //The VB compiler would late bind, but this should provide identical results in most cases I think
                 var compareTextKind = _visualBasicEqualityComparison.OptionCompareTextCaseInsensitive ? SyntaxKind.TrueLiteralExpression : SyntaxKind.FalseLiteralExpression;
                 return member.Invoke(_visualBasicEqualityComparison.ExtraUsingDirectives, lhs, rhs, SyntaxFactory.LiteralExpression(compareTextKind));
             }

CodeConverter/CSharp/ExpressionNodeVisitor.cs

@@ -696,7 +696,9 @@ private CSharpSyntaxNode ConvertAddressOf(VBSyntax.UnaryExpressionSyntax node, E
 
         public override async Task<CSharpSyntaxNode> VisitBinaryExpression(VBasic.Syntax.BinaryExpressionSyntax node)
         {
-            if (await _operatorConverter.ConvertRewrittenBinaryOperatorOrNullAsync(node) is CSharpSyntaxNode nothingComparison) return nothingComparison;
+            if (await _operatorConverter.ConvertRewrittenBinaryOperatorOrNullAsync(node) is ExpressionSyntax operatorNode) {
+                return operatorNode;
+            }
 
             var lhsTypeInfo = _semanticModel.GetTypeInfo(node.Left);
             var rhsTypeInfo = _semanticModel.GetTypeInfo(node.Right);

CodeConverter/Shared/DefaultReferences.cs

@@ -12,7 +12,7 @@ namespace ICSharpCode.CodeConverter.Shared
     /// <summary>
     /// This file requires net standard 2.0 or above. Therefore it should be linked into projects referencing the converter to get a wider range of references.
     /// </summary>
-    public class DefaultReferences
+    public static class DefaultReferences
     {
         private static readonly Assembly[] DefaultAssemblies = new []{
             typeof(object),

Tests/CSharp/ExpressionTests/ByRefTests.cs

@@ -509,7 +509,7 @@ public void Main()
         string argstr1 = Conversions.ToString(tmp1[1]);
         DoSomething(ref argstr1);
         tmp1[1] = argstr1;
-        Debug.Assert(Conversions.ToBoolean(Operators.CompareObjectEqual(Other.lst2[1], 5.ToString(), false)));
+        Debug.Assert(Conversions.ToBoolean(Operators.ConditionalCompareObjectEqual(Other.lst2[1], 5.ToString(), false)));
     }
 }
 

Tests/CSharp/ExpressionTests/ExpressionTests.cs

@@ -1023,7 +1023,7 @@ private void TestMethod()
         object test(object a) => Operators.MultiplyObject(a, 2);
         object test2(object a, object b)
         {
-            if (Conversions.ToBoolean(Operators.CompareObjectGreater(b, 0, false)))
+            if (Conversions.ToBoolean(Operators.ConditionalCompareObjectGreater(b, 0, false)))
                 return Operators.DivideObject(a, b);
             return 0;
         };

Tests/CSharp/ExpressionTests/StringExpressionTests.cs

@@ -358,7 +358,7 @@ public partial class Issue396ComparisonOperatorForStringsAsync
 {
     public Issue396ComparisonOperatorForStringsAsync()
     {
-        b = Operators.CompareObjectGreater(str, """", false);
+        b = Operators.ConditionalCompareObjectGreater(str, """", false);
     }
 
     private object str = 1.ToString();

Tests/CSharp/TypeCastTests.cs

@@ -401,6 +401,52 @@ public static T ToGenericParameter<T>(object Value)
             return (T)Value;
         }
     }
+}");
+        }
+
+        /// <summary>
+        /// We just use ConditionalCompareObjectEqual to make it a bool, but VB emits a late binding call something like this:
+        /// array[0] = Operators.CompareObjectEqual(left, right, false);
+        /// array[1] = "Identical values stored in objects should be equal";
+        /// NewLateBinding.LateCall(this, null, "AssertTrue", array, null, null, null, true);
+        /// This will likely be the same in the vast majority of cases
+        /// </summary>
+        [Fact]
+        public async Task ObjectComparisonIsConvertedToBoolRatherThanLateBoundAsync()
+        {
+            await TestConversionVisualBasicToCSharpAsync(
+                @"Imports System
+
+Public Class CopiedFromTheSelfVerifyingBooleanTests
+    Public Sub VisualBasicEqualityOfNormalObjectsNotSubjectToSpecialStringConversionRules()
+        Dim a1 As Object = 3
+        Dim a2 As Object = 3
+        AssertTrue(a1 = a2, ""Identical values stored in objects should be equal"")
+    End Sub
+
+    Private Sub AssertTrue(v1 As Nullable(Of Boolean), v2 As String)
+    End Sub
+
+    Private Sub AssertTrue(v1 As Boolean, v2 As String)
+    End Sub
+End Class", @"using Microsoft.VisualBasic.CompilerServices; // Install-Package Microsoft.VisualBasic
+
+public partial class CopiedFromTheSelfVerifyingBooleanTests
+{
+    public void VisualBasicEqualityOfNormalObjectsNotSubjectToSpecialStringConversionRules()
+    {
+        object a1 = 3;
+        object a2 = 3;
+        AssertTrue(Operators.ConditionalCompareObjectEqual(a1, a2, false), ""Identical values stored in objects should be equal"");
+    }
+
+    private void AssertTrue(bool? v1, string v2)
+    {
+    }
+
+    private void AssertTrue(bool v1, string v2)
+    {
+    }
 }");
         }
     }

Tests/TestData/SelfVerifyingTests/VBToCS/BooleanTests.vb

@@ -43,24 +43,33 @@ Public Class BooleanTests
     End Sub
 
     <Fact>
-     Public Sub NullableBoolsTrue()
+    Public Sub NullableBoolsTrue()
         Dim x As Object = 4
         Dim res = 1
 
-        If (Not x?.Equals(4))' x != 4
+        If (Not x?.Equals(4)) Then ' x != 4
             res *= 2
         Else
             res *= 3 'Branch taken
         End If
 
 
-        If (x?.Equals(4))' x == 4
+        If (x?.Equals(4)) Then ' x == 4
             res *= 5 'Branch taken
         Else
             res *= 7
         End If
 
         Assert.Equal(15, res)
     End Sub
+
+    <Fact>
+    Public Sub VisualBasicEqualityOfNormalObjectsNotSubjectToSpecialStringConversionRules()
+        Dim a1 As Object = 3
+        Dim a2 As Object = 3
+        Dim b As Object = 4
+        Assert.True(a1 = a2, "Identical values stored in objects should be equal")
+        Assert.False(a1 = b, "Different values stored in objects should not be equal")
+    End Sub
 End Class
 

Tests/TestData/SelfVerifyingTests/VBToCS/StringEqualityTests.vb

@@ -14,16 +14,7 @@ Public Class StringEqualityTests
 
     <Fact>
     Public Sub VisualBasicEqualityOfCharArrays()
-        Assert.True(New Char(){} = New Char(){}, "Char arrays should be compared as strings because that's what happens in VB")
-    End Sub
-
-    <Fact>
-    Public Sub VisualBasicEqualityOfNormalObjectsNotSubjectToSpecialStringConversionRules()
-        Dim a1 As Object = 3
-        Dim a2 As Object = 3
-        Dim b As Object = 4
-        Assert.True(a1 = a2, "Identical values stored in objects should be equal")
-        Assert.False(a1 = b, "Different values stored in objects should not be equal")
+        Assert.True(New Char() {} = New Char() {}, "Char arrays should be compared as strings because that's what happens in VB")
     End Sub
 
     Private nullObject As Object = Nothing

Web/Program.cs

@@ -3,7 +3,7 @@
 
 namespace ICSharpCode.CodeConverter.Web
 {
-    public class Program
+    public static class Program
     {
         public static void Main(string[] args)
         {