[GH-56] - getting semantic model only if syntax tree is within compil…

…ation
nsubstitute · Dec 4, 2018 · aa3b4a6 · aa3b4a6
1 parent cbeafd3
commit aa3b4a6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/src/NSubstitute.Analyzers.CSharp/DiagnosticAnalyzers/ReEntrantCallFinder.cs b/src/NSubstitute.Analyzers.CSharp/DiagnosticAnalyzers/ReEntrantCallFinder.cs
@@ -34,11 +34,14 @@ public ReEntrantCallVisitor(ReEntrantCallFinder reEntrantCallFinder, Compilation
 
             public override void VisitInvocationExpression(InvocationExpressionSyntax node)
             {
-                var semanticModel = _compilation.GetSemanticModel(node.SyntaxTree);
-                var symbolInfo = semanticModel.GetSymbolInfo(node);
-                if (_reEntrantCallFinder.IsReturnsLikeMethod(semanticModel, symbolInfo.Symbol))
+                if (_compilation.ContainsSyntaxTree(node.SyntaxTree))
                 {
-                    _invocationSymbols.Add(symbolInfo.Symbol);
+                    var semanticModel = _compilation.GetSemanticModel(node.SyntaxTree);
+                    var symbolInfo = semanticModel.GetSymbolInfo(node);
+                    if (_reEntrantCallFinder.IsReturnsLikeMethod(semanticModel, symbolInfo.Symbol))
+                    {
+                        _invocationSymbols.Add(symbolInfo.Symbol);
+                    }
                 }
 
                 base.VisitInvocationExpression(node);

diff --git a/src/NSubstitute.Analyzers.VisualBasic/DiagnosticAnalyzers/ReEntrantCallFinder.cs b/src/NSubstitute.Analyzers.VisualBasic/DiagnosticAnalyzers/ReEntrantCallFinder.cs
@@ -33,11 +33,14 @@ public ReEntrantCallVisitor(ReEntrantCallFinder reEntrantCallFinder, Compilation
 
             public override void VisitInvocationExpression(InvocationExpressionSyntax node)
             {
-                var semanticModel = _compilation.GetSemanticModel(node.SyntaxTree);
-                var symbolInfo = semanticModel.GetSymbolInfo(node);
-                if (_reEntrantCallFinder.IsReturnsLikeMethod(semanticModel, symbolInfo.Symbol))
+                if (_compilation.ContainsSyntaxTree(node.SyntaxTree))
                 {
-                    _invocationSymbols.Add(symbolInfo.Symbol);
+                    var semanticModel = _compilation.GetSemanticModel(node.SyntaxTree);
+                    var symbolInfo = semanticModel.GetSymbolInfo(node);
+                    if (_reEntrantCallFinder.IsReturnsLikeMethod(semanticModel, symbolInfo.Symbol))
+                    {
+                        _invocationSymbols.Add(symbolInfo.Symbol);
+                    }
                 }
 
                 base.VisitInvocationExpression(node);