Move existing like operator

Author: GrahamTheCoder

CodeConverter/CSharp/BuiltInVisualBasicOperatorSubsitutions.cs

@@ -83,7 +83,15 @@ private async Task<ExpressionSyntax> ConvertMyGroupCollectionPropertyGetWithUnde
 
             private async Task<ExpressionSyntax> ConvertToLikeOperatorAsync(VBSyntax.BinaryExpressionSyntax node, WellKnownMember member)
             {
-                return null;
+                var (lhs, rhs) = await AcceptSidesAsync(node);
+                var compareText = ValidSyntaxFactory.MemberAccess("CompareMethod", _visualBasicEqualityComparison.OptionCompareTextCaseInsensitive ? "Text" : "Binary");
+                var likeString = ValidSyntaxFactory.MemberAccess("LikeOperator", "LikeString");
+                _visualBasicEqualityComparison.ExtraUsingDirectives.Add("Microsoft.VisualBasic");
+                _visualBasicEqualityComparison.ExtraUsingDirectives.Add("Microsoft.VisualBasic.CompilerServices");
+                return SyntaxFactory.InvocationExpression(
+                    likeString,
+                    ExpressionSyntaxExtensions.CreateArgList(lhs, rhs, compareText)
+                );
             }
 
             private async Task<ExpressionSyntax> ConvertToConcatenateOperatorAsync(VBSyntax.BinaryExpressionSyntax node)

CodeConverter/CSharp/ExpressionNodeVisitor.cs

@@ -737,17 +737,6 @@ public override async Task<CSharpSyntaxNode> VisitBinaryExpression(VBasic.Syntax
             rhs = omitConversion || omitRightConversion ? rhs : CommonConversions.TypeConversionAnalyzer.AddExplicitConversion(node.Right, rhs);
 
 
-            if (node.IsKind(VBasic.SyntaxKind.LikeExpression)) {
-                var compareText = ValidSyntaxFactory.MemberAccess("CompareMethod", _optionCompareText ? "Text" : "Binary");
-                var likeString = ValidSyntaxFactory.MemberAccess("LikeOperator", "LikeString");
-                _extraUsingDirectives.Add("Microsoft.VisualBasic");
-                _extraUsingDirectives.Add("Microsoft.VisualBasic.CompilerServices");
-                return SyntaxFactory.InvocationExpression(
-                    likeString,
-                    ExpressionSyntaxExtensions.CreateArgList(lhs, rhs, compareText)
-                );
-            }
-
             var kind = VBasic.VisualBasicExtensions.Kind(node).ConvertToken(TokenContext.Local);
             var op = SyntaxFactory.Token(CSharpUtil.GetExpressionOperatorTokenKind(kind));
 

CodeConverter/CSharp/VisualBasicEqualityComparison.cs

@@ -26,11 +26,10 @@ namespace ICSharpCode.CodeConverter.CSharp
     internal class VisualBasicEqualityComparison
     {
         private readonly SemanticModel _semanticModel;
-        private readonly HashSet<string> _extraUsingDirectives;
 
         public VisualBasicEqualityComparison(SemanticModel semanticModel, HashSet<string> extraUsingDirectives)
         {
-            _extraUsingDirectives = extraUsingDirectives;
+            ExtraUsingDirectives = extraUsingDirectives;
             _semanticModel = semanticModel;
         }
 
@@ -43,6 +42,8 @@ public enum RequiredType
 
         public bool OptionCompareTextCaseInsensitive { get; set; }
 
+        public HashSet<string> ExtraUsingDirectives { get; }
+
         public RequiredType GetObjectEqualityType(VBSyntax.BinaryExpressionSyntax node, TypeInfo leftType, TypeInfo rightType)
         {
             var typeInfos = new[] {leftType, rightType};
@@ -191,7 +192,7 @@ private static ExpressionSyntax NegateIfNeeded(VBSyntax.BinaryExpressionSyntax n
         public (ExpressionSyntax csLeft, ExpressionSyntax csRight) AdjustForVbStringComparison(VBSyntax.ExpressionSyntax vbLeft, ExpressionSyntax csLeft, TypeInfo lhsTypeInfo, VBSyntax.ExpressionSyntax vbRight, ExpressionSyntax csRight, TypeInfo rhsTypeInfo)
         {
                 if (OptionCompareTextCaseInsensitive) {
-                    _extraUsingDirectives.Add("System.Globalization");
+                    ExtraUsingDirectives.Add("System.Globalization");
                     var compareOptions = SyntaxFactory.Argument(GetCompareTextCaseInsensitiveCompareOptions());
                     var compareString = SyntaxFactory.InvocationExpression(ValidSyntaxFactory.MemberAccess(nameof(CultureInfo), nameof(CultureInfo.CurrentCulture),
                             nameof(CultureInfo.CompareInfo), nameof(CompareInfo.Compare)),
@@ -209,7 +210,7 @@ private static ExpressionSyntax NegateIfNeeded(VBSyntax.BinaryExpressionSyntax n
 
         public ExpressionSyntax GetFullExpressionForVbObjectComparison(VBSyntax.BinaryExpressionSyntax node, ExpressionSyntax lhs, ExpressionSyntax rhs)
         {
-                _extraUsingDirectives.Add("Microsoft.VisualBasic.CompilerServices");
+                ExtraUsingDirectives.Add("Microsoft.VisualBasic.CompilerServices");
                 var optionCompareTextCaseInsensitive = SyntaxFactory.Argument(SyntaxFactory.LiteralExpression(OptionCompareTextCaseInsensitive ? SyntaxKind.TrueKeyword : SyntaxKind.FalseLiteralExpression));
                 var compareObject = SyntaxFactory.InvocationExpression(ValidSyntaxFactory.MemberAccess(nameof(Operators), nameof(Operators.ConditionalCompareObjectEqual)),
                     SyntaxFactory.ArgumentList(SyntaxFactory.SeparatedList(new[]