[GH-131|500] - taking into account ReceivedExtensions.Received with q…

…uantity in analyzers
nsubstitute · Feb 2, 2020 · 721e929 · 721e929
1 parent 013b132
commit 721e929
Show file tree

Hide file tree

Showing 12 changed files with 811 additions and 275 deletions.
diff --git a/src/NSubstitute.Analyzers.Shared/DiagnosticAnalyzers/AbstractUnusedReceivedAnalyzer.cs b/src/NSubstitute.Analyzers.Shared/DiagnosticAnalyzers/AbstractUnusedReceivedAnalyzer.cs
@@ -62,7 +62,8 @@ private void AnalyzeInvocation(SyntaxNodeAnalysisContext syntaxNodeContext)
             var diagnostic = Diagnostic.Create(
                 diagnosticDescriptor,
                 invocationExpression.GetLocation(),
-                methodSymbol.Name);
+                methodSymbol.Name,
+                methodSymbol.ContainingType.Name);
 
             syntaxNodeContext.ReportDiagnostic(diagnostic);
         }

diff --git a/src/NSubstitute.Analyzers.Shared/Extensions/SubstituteSymbolExtensions.cs b/src/NSubstitute.Analyzers.Shared/Extensions/SubstituteSymbolExtensions.cs
@@ -44,7 +44,8 @@ public static bool IsThrowLikeMethod(this ISymbol symbol)
 
         public static bool IsReceivedLikeMethod(this ISymbol symbol)
         {
-            return IsMember(symbol, MetadataNames.ReceivedMethodNames);
+            return IsMember(symbol, MetadataNames.ReceivedMethodNames) ||
+                   IsMember(symbol, MetadataNames.ReceivedWithQuantityMethodNames);
         }
 
         public static bool IsWhenLikeMethod(this ISymbol symbol)

diff --git a/src/NSubstitute.Analyzers.Shared/MetadataNames.cs b/src/NSubstitute.Analyzers.Shared/MetadataNames.cs
@@ -8,6 +8,7 @@ internal class MetadataNames
         public const string NSubstituteArgFullTypeName = "NSubstitute.Arg";
         public const string NSubstituteArgCompatFullTypeName = "NSubstitute.Arg.Compat";
         public const string NSubstituteSubstituteExtensionsFullTypeName = "NSubstitute.SubstituteExtensions";
+        public const string NSubstituteReceivedExtensionsFullTypeName = "NSubstitute.ReceivedExtensions.ReceivedExtensions";
         public const string NSubstituteReturnsExtensionsFullTypeName = "NSubstitute.ReturnsExtensions.ReturnsExtensions";
         public const string NSubstituteExceptionExtensionsFullTypeName = "NSubstitute.ExceptionExtensions.ExceptionExtensions";
         public const string NSubstituteCallInfoFullTypeName = "NSubstitute.Core.CallInfo";
@@ -66,6 +67,12 @@ internal class MetadataNames
             [NSubstituteDidNotReceiveWithAnyArgsMethod] = NSubstituteSubstituteExtensionsFullTypeName
         };
 
+        public static readonly IReadOnlyDictionary<string, string> ReceivedWithQuantityMethodNames = new Dictionary<string, string>
+        {
+            [NSubstituteReceivedMethod] = NSubstituteReceivedExtensionsFullTypeName,
+            [NSubstituteReceivedWithAnyArgsMethod] = NSubstituteReceivedExtensionsFullTypeName,
+        };
+
         public static readonly IReadOnlyDictionary<string, string> WhenMethodNames = new Dictionary<string, string>
         {
             [NSubstituteWhenMethod] = NSubstituteSubstituteExtensionsFullTypeName,

diff --git a/src/NSubstitute.Analyzers.Shared/Resources.resx b/src/NSubstitute.Analyzers.Shared/Resources.resx
@@ -155,7 +155,7 @@
     <comment>An optional longer localizable description of the diagnostic.</comment>
   </data>
   <data name="UnusedReceivedForOrdinaryMethodMessageFormat" xml:space="preserve">
-    <value>Unused received check. To fix, make sure there is a call after "{0}". Correct: "SubstituteExtensions.{0}(sub).SomeCall();". Incorrect: "SubstituteExtensions.{0}(sub);"</value>
+    <value>Unused received check. To fix, make sure there is a call after "{0}". Correct: "{1}.{0}(sub).SomeCall();". Incorrect: "{1}.{0}(sub);"</value>
     <comment>The format-able message the diagnostic displays.</comment>
   </data>
   <data name="UnusedReceivedForOrdinaryMethodTitle" xml:space="preserve">