Fix regex fixer to maintain string literal syntax (#78172)

* Fix regex fixer to maintain string literal syntax * Simplify * Still transform interpolated strings
dotnet · Nov 11, 2022 · e1dcc9c · e1dcc9c
1 parent 7db5a57
commit e1dcc9c
Show file tree

Hide file tree

Showing 2 changed files with 93 additions and 1 deletion.
diff --git a/src/libraries/System.Text.RegularExpressions/gen/UpgradeToGeneratedRegexCodeFixer.cs b/src/libraries/System.Text.RegularExpressions/gen/UpgradeToGeneratedRegexCodeFixer.cs
@@ -274,6 +274,10 @@ static RegexOptions GetRegexOptionsFromArgument(ImmutableArray<IArgumentOperatio
                     string optionsLiteral = Literal(((RegexOptions)(int)argument.Value.ConstantValue.Value).ToString());
                     return SyntaxFactory.ParseExpression(optionsLiteral);
                 }
+                else if (argument.Value is ILiteralOperation literalOperation)
+                {
+                    return literalOperation.Syntax;
+                }
                 else
                 {
                     return generator.LiteralExpression(argument.Value.ConstantValue.Value);

diff --git a/...tem.Text.RegularExpressions/tests/FunctionalTests/UpgradeToGeneratedRegexAnalyzerTests.cs b/...tem.Text.RegularExpressions/tests/FunctionalTests/UpgradeToGeneratedRegexAnalyzerTests.cs
@@ -792,7 +792,7 @@ public async Task LeadingAndTrailingTriviaIsPreservedByFixer()
 static class Class
 {
     public static string CollapseWhitespace(this string text) =>
-        [|Regex.Replace(text, @"" \s+"" , ""  "")|];
+        [|Regex.Replace(text, "" \\s+"" , ""  "")|];
 }";
 
             string expectedFixedCode = @"using System.Text.RegularExpressions;
@@ -808,6 +808,94 @@ public static string CollapseWhitespace(this string text) =>
             await VerifyCS.VerifyCodeFixAsync(test, expectedFixedCode);
         }
 
+        [Fact]
+        public async Task VerbatimStringLiteralSyntaxPreservedByFixer()
+        {
+            string test = @"using System.Text.RegularExpressions;
+
+static class Class
+{
+    public static string CollapseWhitespace(this string text) =>
+        [|Regex.Replace(text, @"" \s+"" , @""  "")|];
+}";
+
+            string expectedFixedCode = @"using System.Text.RegularExpressions;
+
+static partial class Class
+{
+    public static string CollapseWhitespace(this string text) =>
+        MyRegex().Replace(text, @""  "");
+    [GeneratedRegex(@"" \s+"")]
+    private static partial Regex MyRegex();
+}";
+
+            await VerifyCS.VerifyCodeFixAsync(test, expectedFixedCode);
+        }
+
+        [Fact]
+        public async Task RawStringLiteralSyntaxPreservedByFixer()
+        {
+            string test = @"using System.Text.RegularExpressions;
+
+static class Class
+{
+    public static string CollapseWhitespace(this string text) =>
+        [|Regex.Replace(text, """"""
+                              \s+
+                              """""",
+                              """""""" hello """""" world """""""")|];
+}";
+
+            string expectedFixedCode = @"using System.Text.RegularExpressions;
+
+static partial class Class
+{
+    public static string CollapseWhitespace(this string text) =>
+        MyRegex().Replace(text, """""""" hello """""" world """""""");
+    [GeneratedRegex(""""""
+                              \s+
+                              """""")]
+    private static partial Regex MyRegex();
+}";
+
+            await VerifyCS.VerifyCodeFixAsync(test, expectedFixedCode);
+        }
+
+        [Fact]
+        public async Task InterpolatedStringLiteralSyntaxPreservedByFixer()
+        {
+            string test = @"using System.Text.RegularExpressions;
+
+partial class Program
+{
+    static void Main(string[] args)
+    {
+        const string pattern = @""a|b\s\n"";
+        const string pattern2 = $""{pattern}2"";
+
+        Regex regex = [|new Regex(pattern2)|];
+    }
+}";
+
+            string expectedFixedCode = @"using System.Text.RegularExpressions;
+
+partial class Program
+{
+    static void Main(string[] args)
+    {
+        const string pattern = @""a|b\s\n"";
+        const string pattern2 = $""{pattern}2"";
+
+        Regex regex = MyRegex();
+    }
+
+    [GeneratedRegex(""a|b\\s\\n2"")]
+    private static partial Regex MyRegex();
+}";
+
+            await VerifyCS.VerifyCodeFixAsync(test, expectedFixedCode);
+        }
+
         [Fact]
         public async Task TestAsArgument()
         {