[GH-153] - fixing failing tests

nsubstitute · Mar 7, 2021 · 2e2bdb1 · 2e2bdb1
1 parent 779f13f
commit 2e2bdb1
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 12 deletions.
diff --git a/src/NSubstitute.Analyzers.Shared/CodeFixProviders/AbstractReEntrantSetupCodeFixProvider.cs b/src/NSubstitute.Analyzers.Shared/CodeFixProviders/AbstractReEntrantSetupCodeFixProvider.cs
@@ -9,6 +9,7 @@
 using Microsoft.CodeAnalysis.Editing;
 using Microsoft.CodeAnalysis.Operations;
 using Microsoft.CodeAnalysis.Simplification;
+using NSubstitute.Analyzers.Shared.Extensions;
 
 namespace NSubstitute.Analyzers.Shared.CodeFixProviders
 {
@@ -85,7 +86,7 @@ private async Task<Document> CreateChangedDocument(
 
                 if (IsArrayParamsArgument(operation))
                 {
-                    var initializers = GetInitializers(operation);
+                    var initializers = operation.GetSyntaxes();
                     var updatedParamsArgumentSyntaxNode = CreateUpdatedParamsArgumentSyntaxNode(
                         syntaxGenerator,
                         methodSymbol.TypeArguments.FirstOrDefault() ?? methodSymbol.ReceiverType,
@@ -125,11 +126,6 @@ private bool IsArrayParamsArgument(SemanticModel semanticModel, TArgumentSyntax
 
         private bool IsArrayParamsArgument(IArgumentOperation argumentOperation) => argumentOperation != null && argumentOperation.Parameter.IsParams;
 
-        private IEnumerable<SyntaxNode> GetInitializers(IArgumentOperation argumentOperation)
-        {
-            return (argumentOperation.Value as IArrayCreationOperation).Initializer.ElementValues.Select(value => value.Syntax);
-        }
-
         private static TArgumentListSyntax GetArgumentListSyntax(SyntaxNode diagnosticNode) => diagnosticNode.Ancestors().OfType<TArgumentListSyntax>().FirstOrDefault();
     }
 }
diff --git a/...yzers.Shared/DiagnosticAnalyzers/AbstractNonSubstitutableMemberReceivedInOrderAnalyzer.cs b/...yzers.Shared/DiagnosticAnalyzers/AbstractNonSubstitutableMemberReceivedInOrderAnalyzer.cs
@@ -84,6 +84,11 @@ private bool ShouldAnalyzeNode(SemanticModel semanticModel, SyntaxNode syntaxNod
 
             var operation = semanticModel.GetOperation(maybeIgnoredExpression);
 
+            if (syntaxNode.Parent is TMemberAccessExpressionSyntax || semanticModel.GetOperation(syntaxNode.Parent) is IMemberReferenceOperation)
+            {
+                return false;
+            }
+
             if (operation is IArgumentOperation &&
                 operation.Parent is IInvocationOperation invocationOperation &&
                 invocationOperation.TargetMethod.IsReceivedInOrderMethod())

diff --git a/src/NSubstitute.Analyzers.Shared/DiagnosticAnalyzers/AbstractSubstitutionNodeFinder.cs b/src/NSubstitute.Analyzers.Shared/DiagnosticAnalyzers/AbstractSubstitutionNodeFinder.cs
@@ -10,7 +10,10 @@ namespace NSubstitute.Analyzers.Shared.DiagnosticAnalyzers
 {
     internal abstract class AbstractSubstitutionNodeFinder : ISubstitutionNodeFinder
     {
-        public IEnumerable<SyntaxNode> Find(SyntaxNodeAnalysisContext syntaxNodeContext, IInvocationOperation invocationOperation, IMethodSymbol invocationExpressionSymbol = null)
+        public IEnumerable<SyntaxNode> Find(
+            SyntaxNodeAnalysisContext syntaxNodeContext,
+            IInvocationOperation invocationOperation,
+            IMethodSymbol invocationExpressionSymbol = null)
         {
             if (invocationOperation == null)
             {
@@ -20,7 +23,8 @@ public IEnumerable<SyntaxNode> Find(SyntaxNodeAnalysisContext syntaxNodeContext,
             var invocationExpression = invocationOperation.Syntax;
             invocationExpressionSymbol ??= syntaxNodeContext.SemanticModel.GetSymbolInfo(invocationExpression).Symbol as IMethodSymbol;
 
-            if (invocationExpressionSymbol == null || invocationExpressionSymbol.ContainingAssembly.Name.Equals(MetadataNames.NSubstituteAssemblyName, StringComparison.Ordinal) == false)
+            if (invocationExpressionSymbol == null ||
+                invocationExpressionSymbol.ContainingAssembly.Name.Equals(MetadataNames.NSubstituteAssemblyName, StringComparison.Ordinal) == false)
             {
                 return Enumerable.Empty<SyntaxNode>();
             }
@@ -76,7 +80,10 @@ public IEnumerable<SyntaxNode> FindForWhenExpression(SyntaxNodeAnalysisContext s
             }
         }
 
-        public SyntaxNode FindForAndDoesExpression(SyntaxNodeAnalysisContext syntaxNodeContext, IInvocationOperation invocationOperation, IMethodSymbol invocationExpressionSymbol)
+        public SyntaxNode FindForAndDoesExpression(
+            SyntaxNodeAnalysisContext syntaxNodeContext,
+            IInvocationOperation invocationOperation,
+            IMethodSymbol invocationExpressionSymbol)
         {
             if (!(invocationOperation.GetSubstituteOperation() is IInvocationOperation parentInvocationExpression))
             {
@@ -91,7 +98,10 @@ public SyntaxNode FindForStandardExpression(IInvocationOperation invocationOpera
             return invocationOperation.GetSubstituteOperation().Syntax;
         }
 
-        public IEnumerable<SyntaxNode> FindForReceivedInOrderExpression(SyntaxNodeAnalysisContext syntaxNodeContext, IInvocationOperation invocationOperation, IMethodSymbol receivedInOrderInvocationSymbol = null)
+        public IEnumerable<SyntaxNode> FindForReceivedInOrderExpression(
+            SyntaxNodeAnalysisContext syntaxNodeContext,
+            IInvocationOperation invocationOperation,
+            IMethodSymbol receivedInOrderInvocationSymbol = null)
         {
             var argumentOperation = invocationOperation.GetOrderedArgumentOperationsWithoutInstanceArgument().First();
 
@@ -105,7 +115,7 @@ public IEnumerable<SyntaxNode> FindForReceivedInOrderExpression(SyntaxNodeAnalys
 
         private bool ContainsSymbol(ITypeSymbol containerSymbol, ISymbol symbol)
         {
-            return GetBaseTypesAndThis(containerSymbol).Any(typeSymbol => typeSymbol == symbol.ContainingType);
+            return GetBaseTypesAndThis(containerSymbol).Any(typeSymbol => typeSymbol.Equals(symbol.ContainingType));
         }
 
         private static IEnumerable<ITypeSymbol> GetBaseTypesAndThis(ITypeSymbol type)

diff --git a/src/NSubstitute.Analyzers.Shared/Extensions/IOperationExtensions.cs b/src/NSubstitute.Analyzers.Shared/Extensions/IOperationExtensions.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.CodeAnalysis;