Address review comments for user options

dotnet · Apr 27, 2020 · 624f1b5 · 624f1b5
1 parent 990ca20
commit 624f1b5
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/...nalyzers/Core/Microsoft.CodeQuality.Analyzers/Maintainability/DoNotIgnoreMethodResults.cs b/...nalyzers/Core/Microsoft.CodeQuality.Analyzers/Maintainability/DoNotIgnoreMethodResults.cs
@@ -150,13 +150,6 @@ public override void Initialize(AnalysisContext analysisContext)
                 INamedTypeSymbol? xunitAssertType = compilationContext.Compilation.GetOrCreateTypeByMetadataName(WellKnownTypeNames.XunitAssert);
                 INamedTypeSymbol? linqEnumerableType = compilationContext.Compilation.GetOrCreateTypeByMetadataName(WellKnownTypeNames.SystemLinqEnumerable);
 
-                if (!(compilationContext.Compilation.SyntaxTrees.FirstOrDefault() is SyntaxTree tree))
-                {
-                    return;
-                }
-
-                var userDefinedMethods = compilationContext.Options.GetAdditionalUseResultsMethodsOption(UserDefinedMethodRule, tree, compilationContext.Compilation, compilationContext.CancellationToken);
-
                 compilationContext.RegisterOperationBlockStartAction(osContext =>
                 {
                     if (!(osContext.OwningSymbol is IMethodSymbol method))
@@ -167,6 +160,9 @@ public override void Initialize(AnalysisContext analysisContext)
                     osContext.RegisterOperationAction(opContext =>
                     {
                         IOperation expression = ((IExpressionStatementOperation)opContext.Operation).Operation;
+
+                        var userDefinedMethods = compilationContext.Options.GetAdditionalUseResultsMethodsOption(UserDefinedMethodRule, expression.Syntax.SyntaxTree, compilationContext.Compilation, compilationContext.CancellationToken);
+
                         DiagnosticDescriptor? rule = null;
                         string? targetMethodName = null;
                         switch (expression.Kind)