updated NuGet packages versions (#39)

* update NuGet packages versions

* fixed NullConditionalAssertionAnalyzer

Author: Meir017

src/FluentAssertions.Analyzers.Tests/FluentAssertions.Analyzers.Tests.csproj

@@ -7,10 +7,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="5.1.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="1.2.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.2.0" />
+    <PackageReference Include="FluentAssertions" Version="5.3.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
+    <PackageReference Include="MSTest.TestAdapter" Version="1.3.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="1.3.1" />
   </ItemGroup>
 
   <ItemGroup>

src/FluentAssertions.Analyzers/FluentAssertions.Analyzers.csproj

@@ -1,13 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard1.3</TargetFramework>
     <RootNamespace>FluentAssertions.Analyzers</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="2.6.1" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="2.6.1" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="2.8.2" />
     <PackageReference Include="Microsoft.Composition" Version="1.0.31" />
   </ItemGroup>
 

src/FluentAssertions.Analyzers/Tips/NullConditionalAssertionAnalyzer.cs

@@ -62,21 +62,25 @@ protected virtual Diagnostic AnalyzeExpression(ExpressionSyntax expression)
 
         private class ConditionalAccessExpressionVisitor : CSharpSyntaxWalker
         {
-            public bool CodeSmells { get; private set; }
+            private bool _foundConditionalAccess;
+            private bool _foundShouldMethod;
+
+            public bool CodeSmells => _foundShouldMethod && _foundConditionalAccess;
             public Location ConditionalAccess { get; private set; }
 
             public override void VisitConditionalAccessExpression(ConditionalAccessExpressionSyntax node)
             {
-                if (CodeSmells) return;
-
-                CodeSmells = node.WhenNotNull is InvocationExpressionSyntax invocation
-                    && invocation.Expression is MemberAccessExpressionSyntax memberAccess && memberAccess.IsKind(SyntaxKind.SimpleMemberAccessExpression)
-                    && memberAccess.Expression is InvocationExpressionSyntax shouldInvocation
-                    && shouldInvocation.Expression is MemberBindingExpressionSyntax memberBinding
-                    && memberBinding.Name.Identifier.ValueText == "Should";
-                if (CodeSmells)
+                if (!_foundConditionalAccess)
+                {
+                    _foundConditionalAccess = true;
+                }
+                base.VisitConditionalAccessExpression(node);
+            }
+            public override void VisitIdentifierName(IdentifierNameSyntax node)
+            {
+                if(_foundConditionalAccess && node.Identifier.ValueText == "Should")
                 {
-                    ConditionalAccess = node.GetLocation();
+                    _foundShouldMethod = true;
                 }
             }
         }