Update detection logic to see if types are assignable rather than str…

…ictly equal

src/Moq.Analyzers/CallbackSignatureShouldMatchMockedMethodAnalyzer.cs

@@ -74,13 +74,32 @@ private static void Analyze(SyntaxNodeAnalysisContext context)
 
                 TypeInfo mockedMethodArgumentType = context.SemanticModel.GetTypeInfo(mockedMethodArguments[argumentIndex].Expression, context.CancellationToken);
 
-                string? mockedMethodTypeName = mockedMethodArgumentType.ConvertedType?.ToString();
-                string? lambdaParameterTypeName = lambdaParameterType.ConvertedType?.ToString();
 
-                if (!string.Equals(mockedMethodTypeName, lambdaParameterTypeName, StringComparison.Ordinal))
+
+                // Check if types are assignable rather than strictly equal
+                ITypeSymbol? lambdaParameterTypeSymbol = lambdaParameterType.Type;
+                ITypeSymbol? mockedMethodTypeSymbol = mockedMethodArgumentType.Type;
+
+                if (lambdaParameterTypeSymbol is not null && mockedMethodTypeSymbol is not null)
+                {
+
+                    if (!context.SemanticModel.Compilation.ClassifyConversion(lambdaParameterTypeSymbol, mockedMethodTypeSymbol).IsImplicit)
+                    {
+
+                        Diagnostic diagnostic = lambdaParameters[argumentIndex].GetLocation().CreateDiagnostic(Rule);
+                        context.ReportDiagnostic(diagnostic);
+                    }
+                }
+                else
                 {
-                    Diagnostic diagnostic = callbackLambda.ParameterList.CreateDiagnostic(Rule);
-                    context.ReportDiagnostic(diagnostic);
+                    string? mockedMethodTypeName = mockedMethodArgumentType.ConvertedType?.ToString();
+                    string? lambdaParameterTypeName = lambdaParameterType.ConvertedType?.ToString();
+
+                    if (!string.Equals(mockedMethodTypeName, lambdaParameterTypeName, StringComparison.Ordinal))
+                    {
+                        Diagnostic diagnostic = callbackLambda.ParameterList.CreateDiagnostic(Rule);
+                        context.ReportDiagnostic(diagnostic);
+                    }
                 }
             }
         }

tests/Moq.Analyzers.Test/CallbackSignatureShouldMatchMockedMethodCodeFixTests.cs

@@ -1,9 +1,17 @@
+using Xunit.Abstractions;
 using Verifier = Moq.Analyzers.Test.Helpers.CodeFixVerifier<Moq.Analyzers.CallbackSignatureShouldMatchMockedMethodAnalyzer, Moq.Analyzers.CallbackSignatureShouldMatchMockedMethodCodeFix>;
 
 namespace Moq.Analyzers.Test;
 
 public class CallbackSignatureShouldMatchMockedMethodCodeFixTests
 {
+    private readonly ITestOutputHelper _output;
+
+    public CallbackSignatureShouldMatchMockedMethodCodeFixTests(ITestOutputHelper output)
+    {
+        _output = output;
+    }
+
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "MA0051:Method is too long", Justification = "Contains test data")]
     public static IEnumerable<object[]> TestData()
     {
@@ -22,7 +30,7 @@ public static IEnumerable<object[]> TestData()
                 """new Mock<IFoo>().Setup(x => x.Do(It.IsAny<List<string>>())).Returns((List<string> l) => { return 0; });""",
             ],
             [
-                """new Mock<IFoo>().Setup(x => x.Do(It.IsAny<string>())).Callback({|Moq1100:(int i)|} => { });""",
+                """new Mock<IFoo>().Setup(x => x.Do(It.IsAny<string>())).Callback(({|Moq1100:int i|}) => { });""",
                 """new Mock<IFoo>().Setup(x => x.Do(It.IsAny<string>())).Callback((string s) => { });""",
             ],
             [
@@ -34,7 +42,7 @@ public static IEnumerable<object[]> TestData()
                 """new Mock<IFoo>().Setup(x => x.Do(It.IsAny<int>(), It.IsAny<string>(), It.IsAny<DateTime>())).Callback((int i, string s, DateTime dt) => { });""",
             ],
             [
-                """new Mock<IFoo>().Setup(x => x.Do(It.IsAny<List<string>>())).Callback({|Moq1100:(int i)|} => { });""",
+                """new Mock<IFoo>().Setup(x => x.Do(It.IsAny<List<string>>())).Callback(({|Moq1100:int i|}) => { });""",
                 """new Mock<IFoo>().Setup(x => x.Do(It.IsAny<List<string>>())).Callback((List<string> l) => { });""",
             ],
             [
@@ -74,8 +82,8 @@ public static IEnumerable<object[]> TestData()
                 """new Mock<IFoo>().Setup(x => x.Do(It.IsAny<List<string>>())).Returns(0).Callback((List<string> l) => { });""",
             ],
             [ // Repro for https://github.com/rjmurillo/moq.analyzers/issues/172
-                """new Mock<IFoo>().Setup(m => m.DoSomething(It.IsAny<object?>())).Returns((object? bar) => true);""",
-                """new Mock<IFoo>().Setup(m => m.DoSomething(It.IsAny<object?>())).Returns((object? bar) => true);""",
+                """new Mock<IFoo>().Setup(m => m.Do(It.IsAny<object?>())).Returns((object? bar) => true);""",
+                """new Mock<IFoo>().Setup(m => m.Do(It.IsAny<object?>())).Returns((object? bar) => true);""",
             ],
         }.WithNamespaces().WithMoqReferenceAssemblyGroups();
     }
@@ -96,7 +104,7 @@ internal interface IFoo
 
                 int Do(List<string> l);
 
-                bool DoSomething(object? bar);
+                bool Do(object? bar);
             }
 
             internal class UnitTest
@@ -108,6 +116,15 @@ private void Test()
             }
             """;
 
-        await Verifier.VerifyCodeFixAsync(Template(@namespace, original), Template(@namespace, quickFix), referenceAssemblyGroup);
+        string o = Template(@namespace, original);
+        string f = Template(@namespace, quickFix);
+
+        _output.WriteLine("Original:");
+        _output.WriteLine(o);
+        _output.WriteLine(string.Empty);
+        _output.WriteLine("Fixed:");
+        _output.WriteLine(f);
+
+        await Verifier.VerifyCodeFixAsync(o, f, referenceAssemblyGroup);
     }
 }