Apply feedback

dotnet · Jan 5, 2021 · 55094d3 · 55094d3
1 parent 1268525
commit 55094d3
Showing 1 changed file with 8 additions and 11 deletions.
diff --git a/...etAnalyzers/Core/Microsoft.CodeQuality.Analyzers/QualityGuidelines/MarkMembersAsStatic.cs b/...etAnalyzers/Core/Microsoft.CodeQuality.Analyzers/QualityGuidelines/MarkMembersAsStatic.cs
@@ -111,18 +111,15 @@ void OnOperationBlockStart(OperationBlockStartAnalysisContext blockStartContext)
                         return;
                     }
 
-                    bool isInstanceReferenced = methodSymbol.AssociatedSymbol.IsIndexer();
+                    bool isInstanceReferenced = false;
 
-                    if (!isInstanceReferenced)
+                    blockStartContext.RegisterOperationAction(operationContext =>
                     {
-                        blockStartContext.RegisterOperationAction(operationContext =>
+                        if (((IInstanceReferenceOperation)operationContext.Operation).ReferenceKind == InstanceReferenceKind.ContainingTypeInstance)
                         {
-                            if (((IInstanceReferenceOperation)operationContext.Operation).ReferenceKind == InstanceReferenceKind.ContainingTypeInstance)
-                            {
-                                isInstanceReferenced = true;
-                            }
-                        }, OperationKind.InstanceReference);
-                    }
+                            isInstanceReferenced = true;
+                        }
+                    }, OperationKind.InstanceReference);
 
                     blockStartContext.RegisterOperationBlockEndAction(blockEndContext =>
                     {
@@ -205,8 +202,8 @@ private static bool ShouldAnalyze(
                 return false;
             }
 
-            // Do not analyze constructors and finalizers.
-            if (methodSymbol.IsConstructor() || methodSymbol.IsFinalizer())
+            // Do not analyze constructors, finalizers, and indexers.
+            if (methodSymbol.IsConstructor() || methodSymbol.IsFinalizer() || methodSymbol.AssociatedSymbol.IsIndexer())
             {
                 return false;
             }