fixes 18

Author: Meir017

src/FluentAssertions.Analyzers.Tests/Tips/SanityTests.cs

@@ -55,5 +55,15 @@ public void NestedAssertions_ShouldNotTrigger()
 
             DiagnosticVerifier.VerifyCSharpDiagnosticUsingAllAnalyzers(source);
         }
+
+        [TestMethod]
+        [NotImplemented]
+        public void DictionaryShouldContainPair_WhenPropertiesOfDifferentVariables_ShouldNotTrigger()
+        {
+            const string assertion = "actual.Should().ContainValue(pair.Value).And.ContainKey(otherPair.Key);";
+            var source = GenerateCode.DictionaryAssertion(assertion);
+
+            DiagnosticVerifier.VerifyCSharpDiagnosticUsingAllAnalyzers(source);
+    }
     }
 }

src/FluentAssertions.Analyzers/Tips/Collections/CollectionShouldOnlyHaveUniqueItems.cs

@@ -42,7 +42,7 @@ private static bool ArgumentInvokesDistinctMethod(SeparatedSyntaxList<ArgumentSy
                     var visitor = new FluentAssertionsCSharpSyntaxVisitor(new MemberValidator(nameof(Enumerable.Distinct)));
                     invocation.Accept(visitor);
 
-                    return visitor.IsValid && VariableNameExtractor.ExtractVariabeName(arguments.First()) == VariableNameExtractor.ExtractVariabeName(invocation);
+                    return visitor.IsValid(invocation) && VariableNameExtractor.ExtractVariabeName(arguments.First()) == VariableNameExtractor.ExtractVariabeName(invocation);
                 }
                 return false;
             }

src/FluentAssertions.Analyzers/Tips/Dictionaries/DictionaryShouldContainPair.cs

@@ -26,18 +26,37 @@ protected override IEnumerable<FluentAssertionsCSharpSyntaxVisitor> Visitors
                 yield return new ShouldContainValueAndContainKeySyntaxVisitor();
             }
         }
-
-        // TODO: how to extract the property accessing the Key & Value properties and compare them
+        
         public abstract class ContainKeyValueSyntaxVisitor : FluentAssertionsCSharpSyntaxVisitor
         {
-            private string KeyPropertyParentName;
-            private string ValuePropertyParentName;
-
             protected ContainKeyValueSyntaxVisitor(params MemberValidator[] members) : base(members)
             {
             }
 
-            public override bool IsValid => base.IsValid && KeyPropertyParentName == ValuePropertyParentName;
+            public override bool IsValid(ExpressionSyntax expression)
+            {
+                if (!base.IsValid(expression)) return false;
+
+                var visitor = new MemberAccessExpressionsCSharpSyntaxVisitor();
+                expression.Accept(visitor);
+
+                var containKey = visitor.Members.Find(member => member.Name.Identifier.Text == "ContainKey");
+                var containValue = visitor.Members.Find(member => member.Name.Identifier.Text == "ContainValue");
+
+                return containKey.Parent is InvocationExpressionSyntax keyInvocation
+                    && containValue.Parent is InvocationExpressionSyntax valueInvocation
+
+                    && keyInvocation.ArgumentList.Arguments is SeparatedSyntaxList<ArgumentSyntax> containKeyArguments
+                    && valueInvocation.ArgumentList.Arguments is SeparatedSyntaxList<ArgumentSyntax> containValueArguments
+
+                    && containKeyArguments.First().Expression is MemberAccessExpressionSyntax keyArgument
+                    && containValueArguments.First().Expression is MemberAccessExpressionSyntax valueArgument
+
+                    && keyArgument.Expression is IdentifierNameSyntax keyIdentifier
+                    && valueArgument.Expression is IdentifierNameSyntax valueIdentifier
+
+                    && keyIdentifier.Identifier.Text == valueIdentifier.Identifier.Text;
+            }
 
             protected static bool KeyIsProperty(SeparatedSyntaxList<ArgumentSyntax> arguments)
             {
@@ -51,13 +70,9 @@ protected static bool ValueIsProperty(SeparatedSyntaxList<ArgumentSyntax> argume
             {
                 if (!arguments.Any()) return false;
 
-                if (arguments.First().Expression is MemberAccessExpressionSyntax valueAccess
+                return arguments.First().Expression is MemberAccessExpressionSyntax valueAccess
                     && valueAccess.Expression is IdentifierNameSyntax identifier
-                    && valueAccess.Name.Identifier.Text == "Value")
-                {
-                    return true;
-                }
-                return false;
+                    && valueAccess.Name.Identifier.Text == "Value";
             }
         }
 
@@ -136,4 +151,4 @@ private SeparatedSyntaxList<ArgumentSyntax> GetArgumentsWithFirstAsPairIdentifie
             return arguments.Replace(argument, argument.WithExpression(identifier));
         }
     }
-}
+}

src/FluentAssertions.Analyzers/Utilities/FluentAssertionsAnalyzer.cs

@@ -56,7 +56,7 @@ protected virtual Diagnostic AnalyzeExpression(ExpressionSyntax expression)
             {
                 expression.Accept(visitor);
 
-                if (visitor.IsValid)
+                if (visitor.IsValid(expression))
                 {
                     return CreateDiagnostic(visitor, expression);
                 }

src/FluentAssertions.Analyzers/Utilities/FluentAssertionsCSharpSyntaxVisitor.cs

@@ -1,9 +1,6 @@
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
-using System;
 using System.Collections.Immutable;
-using System.Linq;
 
 namespace FluentAssertions.Analyzers
 {
@@ -14,7 +11,7 @@ public class FluentAssertionsCSharpSyntaxVisitor : CSharpSyntaxVisitor
         public ImmutableStack<MemberValidator> AllMembers { get; }
         public ImmutableStack<MemberValidator> Members { get; private set; }
 
-        public virtual bool IsValid => Members.IsEmpty;
+        public virtual bool IsValid(ExpressionSyntax expression) => Members.IsEmpty;
 
         public virtual ImmutableDictionary<string, string> ToDiagnosticProperties() => ImmutableDictionary<string, string>.Empty
             .Add(Constants.DiagnosticProperties.VisitorName, GetType().Name)

src/FluentAssertions.Analyzers/Utilities/FluentAssertionsCodeFixProvider.cs

@@ -61,7 +61,7 @@ protected ExpressionSyntax GetNewExpression(ExpressionSyntax expression, NodeRep
         {
             var visitor = new MemberAccessExpressionsCSharpSyntaxVisitor();
             expression.Accept(visitor);
-            var members =  new LinkedList<MemberAccessExpressionSyntax>(visitor.Members);
+            var members = new LinkedList<MemberAccessExpressionSyntax>(visitor.Members);
 
             var current = members.Last;
             while (current != null)
@@ -78,24 +78,5 @@ protected ExpressionSyntax GetNewExpression(ExpressionSyntax expression, NodeRep
 
             throw new System.InvalidOperationException("should not get here");
         }
-
-        protected class MemberAccessExpressionsCSharpSyntaxVisitor : CSharpSyntaxVisitor
-        {
-            public List<MemberAccessExpressionSyntax> Members { get; } = new List<MemberAccessExpressionSyntax>();
-
-            public override void VisitInvocationExpression(InvocationExpressionSyntax node) => Visit(node.Expression);
-
-            public sealed override void VisitExpressionStatement(ExpressionStatementSyntax node) => Visit(node.Expression);
-
-
-            public sealed override void VisitMemberAccessExpression(MemberAccessExpressionSyntax node)
-            {
-                if (node.Name.Identifier.Text != "And")
-                {
-                    Members.Add(node);
-                }
-                Visit(node.Expression);
-            }
-        }
     }
 }

src/FluentAssertions.Analyzers/Utilities/MemberAccessExpressionsCSharpSyntaxVisitor.cs

@@ -0,0 +1,31 @@
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace FluentAssertions.Analyzers
+{
+    public class MemberAccessExpressionsCSharpSyntaxVisitor : CSharpSyntaxVisitor
+    {
+        public List<MemberAccessExpressionSyntax> Members { get; } = new List<MemberAccessExpressionSyntax>();
+
+        public override void VisitInvocationExpression(InvocationExpressionSyntax node) => Visit(node.Expression);
+
+        public sealed override void VisitExpressionStatement(ExpressionStatementSyntax node) => Visit(node.Expression);
+
+
+        public sealed override void VisitMemberAccessExpression(MemberAccessExpressionSyntax node)
+        {
+            if (node.Name.Identifier.Text != "And")
+            {
+                Members.Add(node);
+            }
+            Visit(node.Expression);
+        }
+    }
+}