From e598b8c9af505eeb124c7a688fd07ecf26b228f5 Mon Sep 17 00:00:00 2001
From: tpodolak <misiek767@gmail.com>
Date: Sat, 10 Oct 2020 23:48:05 +0200
Subject: [PATCH] [GH-153] - simplifying SubstituteAnalyzer

---
 .../DiagnosticAnalyzers/SubstituteAnalyzer.cs              | 2 +-
 .../DiagnosticAnalyzers/AbstractSubstituteAnalyzer.cs      | 7 ++-----
 .../DiagnosticAnalyzers/SubstituteAnalyzer.cs              | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/NSubstitute.Analyzers.CSharp/DiagnosticAnalyzers/SubstituteAnalyzer.cs b/src/NSubstitute.Analyzers.CSharp/DiagnosticAnalyzers/SubstituteAnalyzer.cs
index 328b6f58..56128637 100644
--- a/src/NSubstitute.Analyzers.CSharp/DiagnosticAnalyzers/SubstituteAnalyzer.cs
+++ b/src/NSubstitute.Analyzers.CSharp/DiagnosticAnalyzers/SubstituteAnalyzer.cs
@@ -9,7 +9,7 @@
 namespace NSubstitute.Analyzers.CSharp.DiagnosticAnalyzers
 {
     [DiagnosticAnalyzer(LanguageNames.CSharp)]
-    internal sealed class SubstituteAnalyzer : AbstractSubstituteAnalyzer<SyntaxKind, InvocationExpressionSyntax, ExpressionSyntax, ArgumentSyntax>
+    internal sealed class SubstituteAnalyzer : AbstractSubstituteAnalyzer<SyntaxKind, InvocationExpressionSyntax>
     {
         public SubstituteAnalyzer()
             : base(NSubstitute.Analyzers.CSharp.DiagnosticDescriptorsProvider.Instance, SubstituteProxyAnalysis.Instance, SubstituteConstructorAnalysis.Instance, SubstituteConstructorMatcher.Instance)
diff --git a/src/NSubstitute.Analyzers.Shared/DiagnosticAnalyzers/AbstractSubstituteAnalyzer.cs b/src/NSubstitute.Analyzers.Shared/DiagnosticAnalyzers/AbstractSubstituteAnalyzer.cs
index edd17bfa..48a4c122 100644
--- a/src/NSubstitute.Analyzers.Shared/DiagnosticAnalyzers/AbstractSubstituteAnalyzer.cs
+++ b/src/NSubstitute.Analyzers.Shared/DiagnosticAnalyzers/AbstractSubstituteAnalyzer.cs
@@ -7,11 +7,9 @@
 
 namespace NSubstitute.Analyzers.Shared.DiagnosticAnalyzers
 {
-    internal abstract class AbstractSubstituteAnalyzer<TSyntaxKind, TInvocationExpressionSyntax, TExpressionSyntax, TArgumentSyntax> : AbstractDiagnosticAnalyzer
+    internal abstract class AbstractSubstituteAnalyzer<TSyntaxKind, TInvocationExpressionSyntax> : AbstractDiagnosticAnalyzer
         where TSyntaxKind : struct
         where TInvocationExpressionSyntax : SyntaxNode
-        where TExpressionSyntax : SyntaxNode
-        where TArgumentSyntax : SyntaxNode
     {
         private readonly ISubstituteProxyAnalysis<TInvocationExpressionSyntax> _substituteProxyAnalysis;
         private readonly ISubstituteConstructorAnalysis<TInvocationExpressionSyntax> _substituteConstructorAnalysis;
@@ -211,11 +209,10 @@ private bool AnalyzeConstructorParametersCount(SubstituteContext<TInvocationExpr
 
             if (constructorContext.PossibleConstructors != null && constructorContext.PossibleConstructors.Any() == false)
             {
-                var symbol = substituteContext.SyntaxNodeAnalysisContext.SemanticModel.GetSymbolInfo(substituteContext.InvocationExpression);
                 var diagnostic = Diagnostic.Create(
                     DiagnosticDescriptorsProvider.SubstituteForConstructorParametersMismatch,
                     substituteContext.InvocationExpression.GetLocation(),
-                    symbol.Symbol.ToMinimalMethodString(substituteContext.SyntaxNodeAnalysisContext.SemanticModel),
+                    substituteContext.MethodSymbol.ToMinimalMethodString(substituteContext.SyntaxNodeAnalysisContext.SemanticModel),
                     constructorContext.ConstructorType);
 
                 substituteContext.SyntaxNodeAnalysisContext.ReportDiagnostic(diagnostic);
diff --git a/src/NSubstitute.Analyzers.VisualBasic/DiagnosticAnalyzers/SubstituteAnalyzer.cs b/src/NSubstitute.Analyzers.VisualBasic/DiagnosticAnalyzers/SubstituteAnalyzer.cs
index 91a1f6ef..dd0a4d76 100644
--- a/src/NSubstitute.Analyzers.VisualBasic/DiagnosticAnalyzers/SubstituteAnalyzer.cs
+++ b/src/NSubstitute.Analyzers.VisualBasic/DiagnosticAnalyzers/SubstituteAnalyzer.cs
@@ -9,7 +9,7 @@
 namespace NSubstitute.Analyzers.VisualBasic.DiagnosticAnalyzers
 {
     [DiagnosticAnalyzer(LanguageNames.VisualBasic)]
-    internal sealed class SubstituteAnalyzer : AbstractSubstituteAnalyzer<SyntaxKind, InvocationExpressionSyntax, ExpressionSyntax, ArgumentSyntax>
+    internal sealed class SubstituteAnalyzer : AbstractSubstituteAnalyzer<SyntaxKind, InvocationExpressionSyntax>
     {
         protected override SyntaxKind InvocationExpressionKind { get; } = SyntaxKind.InvocationExpression;