[GH-61] - AndDoes draf of checks for ordinary methods

nsubstitute · Feb 2, 2019 · 172d4ae · 172d4ae
1 parent 9f52c20
commit 172d4ae
Show file tree

Hide file tree

Showing 7 changed files with 1,218 additions and 9 deletions.
diff --git a/src/NSubstitute.Analyzers.CSharp/DiagnosticAnalyzers/CallInfoAnalyzer.cs b/src/NSubstitute.Analyzers.CSharp/DiagnosticAnalyzers/CallInfoAnalyzer.cs
@@ -16,8 +16,7 @@ internal class CallInfoAnalyzer : AbstractCallInfoAnalyzer<SyntaxKind, Invocatio
     {
         private static ImmutableArray<Type> callHierarchy = ImmutableArray.Create(
             typeof(MemberAccessExpressionSyntax),
-            typeof(InvocationExpressionSyntax),
-            typeof(MemberAccessExpressionSyntax));
+            typeof(InvocationExpressionSyntax));
 
         public CallInfoAnalyzer()
             : base(new DiagnosticDescriptorsProvider())
@@ -26,7 +25,7 @@ public CallInfoAnalyzer()
 
         protected override SyntaxKind InvocationExpressionKind { get; } = SyntaxKind.InvocationExpression;
 
-        protected override SyntaxNode GetSubstituteCall(IMethodSymbol methodSymbol, InvocationExpressionSyntax invocationExpressionSyntax)
+        protected override SyntaxNode GetSubstituteCall(SyntaxNodeAnalysisContext syntaxNodeContext, IMethodSymbol methodSymbol, InvocationExpressionSyntax invocationExpressionSyntax)
         {
             if (methodSymbol.IsExtensionMethod)
             {
@@ -53,8 +52,16 @@ protected override SyntaxNode GetSubstituteCall(IMethodSymbol methodSymbol, Invo
                     }
                 }
 
-                if (hierarchyEnumerator.MoveNext() == false && descendantNodesEnumerator.MoveNext())
+                if (hierarchyEnumerator.MoveNext() == false)
                 {
+                    var symbol = syntaxNodeContext.SemanticModel.GetSymbolInfo(descendantNodesEnumerator.Current);
+
+                    if (symbol.Symbol is IMethodSymbol mSymbol && mSymbol.ReducedFrom == null)
+                    {
+                        return ((InvocationExpressionSyntax)descendantNodesEnumerator.Current).ArgumentList.Arguments
+                            .First().Expression;
+                    }
+
                     return descendantNodesEnumerator.Current;
                 }
             }

diff --git a/src/NSubstitute.Analyzers.Shared/DiagnosticAnalyzers/AbstractCallInfoAnalyzer.cs b/src/NSubstitute.Analyzers.Shared/DiagnosticAnalyzers/AbstractCallInfoAnalyzer.cs
@@ -48,7 +48,7 @@ public override void Initialize(AnalysisContext context)
 
         protected abstract TSyntaxKind InvocationExpressionKind { get; }
 
-        protected abstract SyntaxNode GetSubstituteCall(IMethodSymbol methodSymbol, TInvocationExpressionSyntax invocationExpressionSyntax);
+        protected abstract SyntaxNode GetSubstituteCall(SyntaxNodeAnalysisContext syntaxNodeContext, IMethodSymbol methodSymbol, TInvocationExpressionSyntax invocationExpressionSyntax);
 
         protected abstract IEnumerable<TExpressionSyntax> GetArgumentExpressions(TInvocationExpressionSyntax invocationExpressionSyntax);
 
@@ -288,7 +288,7 @@ private bool SupportsCallInfo(SyntaxNodeAnalysisContext syntaxNodeContext, TInvo
 
         private IList<IParameterSymbol> GetSubstituteCallParameters(SyntaxNodeAnalysisContext syntaxNodeContext, IMethodSymbol methodSymbol, TInvocationExpressionSyntax invocationExpression)
         {
-            var parentMethodCallSyntax = GetSubstituteCall(methodSymbol, invocationExpression);
+            var parentMethodCallSyntax = GetSubstituteCall(syntaxNodeContext, methodSymbol, invocationExpression);
             var symbol = syntaxNodeContext.SemanticModel.GetSymbolInfo(parentMethodCallSyntax).Symbol;
 
             switch (symbol)

diff --git a/src/NSubstitute.Analyzers.VisualBasic/DiagnosticAnalyzers/CallInfoAnalyzer.cs b/src/NSubstitute.Analyzers.VisualBasic/DiagnosticAnalyzers/CallInfoAnalyzer.cs
@@ -26,7 +26,7 @@ public CallInfoAnalyzer()
 
         protected override SyntaxKind InvocationExpressionKind { get; } = SyntaxKind.InvocationExpression;
 
-        protected override SyntaxNode GetSubstituteCall(IMethodSymbol methodSymbol, InvocationExpressionSyntax invocationExpressionSyntax)
+        protected override SyntaxNode GetSubstituteCall(SyntaxNodeAnalysisContext syntaxNodeContext, IMethodSymbol methodSymbol, InvocationExpressionSyntax invocationExpressionSyntax)
         {
             if (methodSymbol.IsExtensionMethod)
             {

diff --git a/...llInfoAnalyzerTests/AndDoesMethodTests.cs → ...esMethodPrecededByExtensionMethodTests.cs b/...llInfoAnalyzerTests/AndDoesMethodTests.cs → ...esMethodPrecededByExtensionMethodTests.cs
@@ -4,7 +4,7 @@
 namespace NSubstitute.Analyzers.Tests.CSharp.DiagnosticAnalyzerTests.CallInfoAnalyzerTests
 {
     [CombinatoryData("AndDoes")]
-    public class AndDoesMethodTests : CallInfoDiagnosticVerifier
+    public class AndDoesMethodPrecededByExtensionMethodTests : CallInfoDiagnosticVerifier
     {
         public override async Task ReportsNoDiagnostics_WhenSubstituteMethodCannotBeInferred(string method, string call, string argAccess)
         {