Merge pull request #1232 from icsharpcode/fix-issue-1089-16460915266695110559

Fix Issue #1089: Don't optimize Option Compare Text empty string

Author: GrahamTheCoder

CodeConverter/CSharp/VisualBasicEqualityComparison.cs

@@ -179,6 +179,12 @@ private static ObjectCreationExpressionSyntax NewStringFromArg(ExpressionSyntax
     public bool TryConvertToNullOrEmptyCheck(VBSyntax.BinaryExpressionSyntax node, ExpressionSyntax lhs,
         ExpressionSyntax rhs, out CSharpSyntaxNode? visitBinaryExpression)
     {
+        if (OptionCompareTextCaseInsensitive)
+        {
+            visitBinaryExpression = null;
+            return false;
+        }
+
         bool lhsEmpty = IsNothingOrEmpty(node.Left);
         bool rhsEmpty = IsNothingOrEmpty(node.Right);
 

Tests/CSharp/ExpressionTests/StringExpressionTests.cs

@@ -208,11 +208,11 @@ public void Foo()
         {
             throw new Exception();
         }
-        if (string.IsNullOrEmpty(s1))
+        if (CultureInfo.CurrentCulture.CompareInfo.Compare(s1 ?? """", """", CompareOptions.IgnoreCase | CompareOptions.IgnoreKanaType | CompareOptions.IgnoreWidth) == 0)
         {
             // 
         }
-        if (string.IsNullOrEmpty(s1))
+        if (CultureInfo.CurrentCulture.CompareInfo.Compare(s1 ?? """", """", CompareOptions.IgnoreCase | CompareOptions.IgnoreKanaType | CompareOptions.IgnoreWidth) == 0)
         {
             // 
         }