Fix RCS1197 (#1166)

Co-authored-by: Josef Pihrt <josef@pihrt.net>
dotnet · Nov 27, 2023 · dd33e0d · dd33e0d
1 parent 309e68c
commit dd33e0d
Show file tree

Hide file tree

Showing 4 changed files with 102 additions and 5 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -25,6 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fix analyzer [RCS1158](https://josefpihrt.github.io/docs/roslynator/analyzers/RCS1158) ([PR](https://github.com/dotnet/roslynator/pull/1288))
 - Fix analyzer [RCS1032](https://josefpihrt.github.io/docs/roslynator/analyzers/RCS1032) ([PR](https://github.com/dotnet/roslynator/pull/1289))
 - Fix analyzer [RCS1176](https://josefpihrt.github.io/docs/roslynator/analyzers/RCS1176) ([PR](https://github.com/dotnet/roslynator/pull/1291))
+- Fix analyzer [RCS1197](https://josefpihrt.github.io/docs/roslynator/analyzers/RCS1197) ([PR](https://github.com/dotnet/roslynator/pull/1166))
 
 ## [4.6.4] - 2023-11-24
 

diff --git a/src/Tests/Analyzers.Tests/RCS1197OptimizeStringBuilderAppendCallTests.cs b/src/Tests/Analyzers.Tests/RCS1197OptimizeStringBuilderAppendCallTests.cs
@@ -370,6 +370,69 @@ void M()
 ");
     }
 
+    [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.OptimizeStringBuilderAppendCall)]
+    public async Task Test_InterpolatedRawString_ContainingQuotes()
+    {
+        await VerifyDiagnosticAndFixAsync(@"
+using System.Text;
+class C
+{
+    void M()
+    {
+        string s = null;
+        var sb = new StringBuilder();
+        sb.Append([|$""""""""<a href=""somelink"">{s}</a>""""""""|]);
+    }
+}
+", @"
+using System.Text;
+class C
+{
+    void M()
+    {
+        string s = null;
+        var sb = new StringBuilder();
+        sb.Append(""""""""<a href=""somelink"">"""""""").Append(s).Append(""""""""</a>"""""""");
+    }
+}
+", options: WellKnownCSharpTestOptions.Default_CSharp11);
+    }
+
+    [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.OptimizeStringBuilderAppendCall)]
+    public async Task Test_InterpolatedMultilineRawString_ContainingQuotes()
+    {
+        await VerifyDiagnosticAndFixAsync(@"
+using System.Text;
+class C
+{
+    void M()
+    {
+        string s = null;
+        var sb = new StringBuilder();
+        sb.Append([|$""""""
+                    <a href=""somelink"">{s}</a>
+""""""|]
+        );
+    }
+}
+", @"
+using System.Text;
+class C
+{
+    void M()
+    {
+        string s = null;
+        var sb = new StringBuilder();
+        sb.Append(""""""
+                    <a href=""somelink"">
+"""""").Append(s).Append(""""""
+</a>
+"""""");
+    }
+}
+", options: WellKnownCSharpTestOptions.Default_CSharp11);
+    }
+
     [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.OptimizeStringBuilderAppendCall)]
     public async Task Test_InterpolatedString_Char()
     {

diff --git a/src/Tests/Tests.Common/Testing/CSharp/WellKnownCSharpTestOptions.cs b/src/Tests/Tests.Common/Testing/CSharp/WellKnownCSharpTestOptions.cs
@@ -14,6 +14,7 @@ public static class WellKnownCSharpTestOptions
     private static CSharpTestOptions _default_CSharp7_3;
     private static CSharpTestOptions _default_CSharp8;
     private static CSharpTestOptions _default_CSharp9;
+    private static CSharpTestOptions _default_CSharp11;
     private static CSharpTestOptions _default_NullableReferenceTypes;
 
     public static CSharpTestOptions Default_CSharp5
@@ -94,6 +95,19 @@ public static CSharpTestOptions Default_CSharp9
         }
     }
 
+    public static CSharpTestOptions Default_CSharp11
+    {
+        get
+        {
+            if (_default_CSharp11 is null)
+                Interlocked.CompareExchange(ref _default_CSharp11, Create(), null);
+
+            return _default_CSharp11;
+
+            static CSharpTestOptions Create() => DefaultCSharpTestOptions.Value.WithParseOptions(DefaultCSharpTestOptions.Value.ParseOptions.WithLanguageVersion(LanguageVersion.CSharp11));
+        }
+    }
+
     public static CSharpTestOptions Default_NullableReferenceTypes
     {
         get

diff --git a/...s.Common/CSharp/Refactorings/ConvertInterpolatedStringToStringBuilderMethodRefactoring.cs b/...s.Common/CSharp/Refactorings/ConvertInterpolatedStringToStringBuilderMethodRefactoring.cs
@@ -3,6 +3,7 @@
 using System;
 using System.Collections.Immutable;
 using System.Text;
+using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Roslynator.Text;
@@ -70,12 +71,30 @@ public static (SyntaxKind contentKind, string methodName, ImmutableArray<Argumen
                     string text = interpolatedStringText.TextToken.Text;
 
                     text = StringUtility.ReplaceDoubleBracesWithSingleBrace(text);
+                    if (content.Parent is InterpolatedStringExpressionSyntax interpolatedStringExpression
+                        && interpolatedStringExpression.StringStartToken.IsKind(SyntaxKind.InterpolatedSingleLineRawStringStartToken))
+                    {
+                        text = interpolatedStringExpression.StringStartToken.ValueText.Substring(1)
+                            + text
+                            + interpolatedStringExpression.StringEndToken.ValueText;
+                    }
+                    else if (content.Parent is InterpolatedStringExpressionSyntax interpolatedStringExpression2
+                        && interpolatedStringExpression2.StringStartToken.IsKind(SyntaxKind.InterpolatedMultiLineRawStringStartToken))
+                    {
+                        text = interpolatedStringExpression2.StringStartToken.ValueText.Substring(1)
+                            + text
+                            + interpolatedStringExpression2.StringEndToken.ValueText;
+                    }
+                    else if (isVerbatim)
+                    {
+                        text = "@\"" + text + "\"";
+                    }
+                    else
+                    {
+                        text = "\"" + text + "\"";
+                    }
 
-                    text = (isVerbatim)
-                        ? "@\"" + text + "\""
-                        : "\"" + text + "\"";
-
-                    ExpressionSyntax stringLiteral = ParseExpression(text);
+                    ExpressionSyntax stringLiteral = ParseExpression(text).WithTriviaFrom(interpolatedStringText);
 
                     return (kind, "Append", ImmutableArray.Create(Argument(stringLiteral)));
                 }