Fix RCS1267 (#1412)

dotnet · Feb 22, 2024 · 243c71c · 243c71c
1 parent 9f1cea7
commit 243c71c
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 1 deletion.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- Fix analyzer [RCS1267](https://josefpihrt.github.io/docs/roslynator/analyzers/RCS1267) ([PR](https://github.com/dotnet/roslynator/pull/1412))
+
 ## [4.11.0] - 2024-02-19
 
 ### Added

diff --git a/src/Analyzers/CSharp/Analysis/UseStringInterpolationInsteadOfStringConcatAnalysis.cs b/src/Analyzers/CSharp/Analysis/UseStringInterpolationInsteadOfStringConcatAnalysis.cs
@@ -19,6 +19,7 @@ internal static void Analyze(SyntaxNodeAnalysisContext context, SimpleMemberInvo
             && symbol.ContainingType.IsString())
         {
             bool? isVerbatim = null;
+            var containsNonLiteral = false;
 
             foreach (ArgumentSyntax argument in invocationInfo.Arguments)
             {
@@ -31,7 +32,18 @@ internal static void Analyze(SyntaxNodeAnalysisContext context, SimpleMemberInvo
                 {
                     var literalExpression = (LiteralExpressionSyntax)expression;
 
-                    if (literalExpression.Token.Text.StartsWith("@"))
+                    string text = literalExpression.Token.Text;
+
+                    for (int i = 0; i < text.Length; i++)
+                    {
+                        if (text[i] == '{'
+                            || text[i] == '}')
+                        {
+                            return;
+                        }
+                    }
+
+                    if (text.StartsWith("@"))
                     {
                         if (isVerbatim is null)
                         {
@@ -51,9 +63,14 @@ internal static void Analyze(SyntaxNodeAnalysisContext context, SimpleMemberInvo
                         return;
                     }
                 }
+                else
+                {
+                    containsNonLiteral = true;
+                }
             }
 
             if (isVerbatim is not null
+                && containsNonLiteral
                 && invocationInfo.ArgumentList.IsSingleLine())
             {
                 DiagnosticHelpers.ReportDiagnostic(context, DiagnosticRules.UseStringInterpolationInsteadOfStringConcat, invocationInfo.InvocationExpression);

diff --git a/src/Tests/Analyzers.Tests/RCS1267UseStringInterpolationInsteadOfStringConcatTests.cs b/src/Tests/Analyzers.Tests/RCS1267UseStringInterpolationInsteadOfStringConcatTests.cs
@@ -171,4 +171,37 @@ void M()
 """
         );
     }
+
+    [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.UseStringInterpolationInsteadOfStringConcat)]
+    public async Task TestNoDiagnostic_ContainsBraces()
+    {
+        await VerifyNoDiagnosticAsync("""
+using System;
+
+class C
+{
+    void M()
+    {
+        string s1 = string.Concat(DateTime.Now, " { ", " ");
+        string s2 = string.Concat(DateTime.Now, " ", " } ");
+    }
+}
+""");
+    }
+
+    [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.UseStringInterpolationInsteadOfStringConcat)]
+    public async Task TestNoDiagnostic_LiteralExpressionsOnly()
+    {
+        await VerifyNoDiagnosticAsync("""
+using System;
+
+class C
+{
+    void M()
+    {
+        string s = string.Concat("a", "b", "c");
+    }
+}
+""");
+    }
 }