support string.Format in direct usage

DapperLib · Oct 22, 2023 · c61b69c · c61b69c
1 parent 1280a1a
commit c61b69c
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/src/Dapper.AOT.Analyzers/Internal/Inspection.cs b/src/Dapper.AOT.Analyzers/Internal/Inspection.cs
@@ -966,6 +966,7 @@ public static bool TryGetConstantValueWithSyntax<T>(IOperation val, out T? value
 
                         if (initializer is BinaryExpressionSyntax)
                         {
+                            // since we are parsing `string` here, `BinaryExpression` stands for string concatenation
                             value = default!;
                             syntax = null;
                             syntaxKind = SyntaxKind.AddExpression;
@@ -992,6 +993,21 @@ public static bool TryGetConstantValueWithSyntax<T>(IOperation val, out T? value
                 return false;
             }
 
+            if (val is IInvocationOperation invocation)
+            {
+                if (invocation.TargetMethod is { 
+                        Name: "Format",
+                        ContainingType: { SpecialType: SpecialType.System_String },
+                        ContainingNamespace: { Name: "System" }
+                    })
+                {
+                    value = default!;
+                    syntax = null;
+                    syntaxKind = SyntaxKind.AddExpression;
+                    return false;
+                }
+            }
+
             // other non-trivial default constant values
             if (val.ConstantValue.HasValue)
             {

diff --git a/test/Dapper.AOT.Test/Verifiers/DAP242.cs b/test/Dapper.AOT.Test/Verifiers/DAP242.cs
@@ -33,6 +33,12 @@ public Task ConcatenatedStringDetection_LocalVariableUsage() => Test("""
         _ = connection.Query<int>({|#0:sqlQuery|});
     """, Diagnostic(Diagnostics.ConcatenatedStringSqlExpression).WithLocation(0));
 
+    [Fact]
+    public Task ConcatenatedStringDetection_StringFormat() => Test("""
+        int id = 1;
+        _ = connection.Query<int>({|#0:string.Format("select Id from Customers where Id = {0}", id)|});
+    """, Diagnostic(Diagnostics.ConcatenatedStringSqlExpression).WithLocation(0));
+
     private Task Test(string methodCode, params DiagnosticResult[] expected) => CSVerifyAsync($$"""
         using Dapper;
         using System.Data;