[GH-108] - better way of finding symbol usages

nsubstitute · Sep 13, 2020 · a838b02 · a838b02
1 parent a0156dc
commit a838b02
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 32 deletions.
diff --git a/...ute.Analyzers.CSharp/DiagnosticAnalyzers/NonSubstitutableMemberReceivedInOrderAnalyzer.cs b/...ute.Analyzers.CSharp/DiagnosticAnalyzers/NonSubstitutableMemberReceivedInOrderAnalyzer.cs
@@ -21,10 +21,5 @@ public NonSubstitutableMemberReceivedInOrderAnalyzer()
         protected override SyntaxKind InvocationExpressionKind { get; } = SyntaxKind.InvocationExpression;
 
         protected override ImmutableArray<int> IgnoredAncestorPaths { get; } = IgnoredPaths;
-
-        protected override ISymbol GetDeclarationSymbol(SemanticModel semanticModel, SyntaxNode node)
-        {
-            return semanticModel.GetDeclaredSymbol(node);
-        }
     }
 }
diff --git a/...yzers.Shared/DiagnosticAnalyzers/AbstractNonSubstitutableMemberReceivedInOrderAnalyzer.cs b/...yzers.Shared/DiagnosticAnalyzers/AbstractNonSubstitutableMemberReceivedInOrderAnalyzer.cs
@@ -44,8 +44,6 @@ protected sealed override void InitializeAnalyzer(AnalysisContext context)
             context.RegisterSyntaxNodeAction(_analyzeInvocationAction, InvocationExpressionKind);
         }
 
-        protected abstract ISymbol GetDeclarationSymbol(SemanticModel semanticModel, SyntaxNode node);
-
         protected override Location GetSubstitutionNodeActualLocation(in NonSubstitutableMemberAnalysisResult analysisResult)
         {
             return analysisResult.Member.GetSubstitutionNodeActualLocation<TMemberAccessExpressionSyntax>(analysisResult.Symbol);
@@ -104,7 +102,7 @@ operation.Parent is IInvocationOperation invocationOperation &&
                 return false;
             }
 
-            var symbol = GetDeclarationSymbol(semanticModel, maybeIgnoredExpression);
+            var symbol = GetVariableDeclaratorSymbol(operation);
 
             if (symbol == null)
             {
@@ -123,6 +121,16 @@ operation.Parent is IInvocationOperation invocationOperation &&
             return !dataFlowAnalysis.ReadInside.Contains(symbol);
         }
 
+        private static ILocalSymbol GetVariableDeclaratorSymbol(IOperation operation)
+        {
+            return operation switch
+            {
+                IVariableDeclaratorOperation declarator => declarator.Symbol,
+                IVariableDeclarationOperation declarationOperation => declarationOperation.Declarators.FirstOrDefault()?.Symbol,
+                _ => null
+            };
+        }
+
         private SyntaxNode FindIgnoredEnclosingExpression(SyntaxNode syntaxNode)
         {
             return syntaxNode.Ancestors().FirstOrDefault(ancestor => IgnoredAncestorPaths.Contains(ancestor.RawKind));

diff --git a/...nalyzers.VisualBasic/DiagnosticAnalyzers/NonSubstitutableMemberReceivedInOrderAnalyzer.cs b/...nalyzers.VisualBasic/DiagnosticAnalyzers/NonSubstitutableMemberReceivedInOrderAnalyzer.cs
@@ -23,29 +23,5 @@ public NonSubstitutableMemberReceivedInOrderAnalyzer()
         protected override SyntaxKind InvocationExpressionKind { get; } = SyntaxKind.InvocationExpression;
 
         protected override ImmutableArray<int> IgnoredAncestorPaths { get; } = IgnoredPaths;
-
-        protected override ISymbol GetDeclarationSymbol(SemanticModel semanticModel, SyntaxNode node)
-        {
-            var symbol = semanticModel.GetDeclaredSymbol(node);
-
-            if (symbol != null)
-            {
-                return symbol;
-            }
-
-            if (!(node is VariableDeclaratorSyntax variableDeclaratorSyntax))
-            {
-                return null;
-            }
-
-            var modifiedIdentifierSyntax = variableDeclaratorSyntax.Names.FirstOrDefault();
-
-            if (modifiedIdentifierSyntax == null)
-            {
-                return null;
-            }
-
-            return semanticModel.GetDeclaredSymbol(modifiedIdentifierSyntax);
-        }
     }
 }