Apply feedback

Youssef1313 · web-flow · commit 55094d352e40 · 2021-01-05T10:17:35.000+02:00
diff --git a/src/NetAnalyzers/Core/Microsoft.CodeQuality.Analyzers/QualityGuidelines/MarkMembersAsStatic.cs b/src/NetAnalyzers/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;
             }

Original file line number	Diff line number	Diff line change
`@@ -111,18 +111,15 @@ void OnOperationBlockStart(OperationBlockStartAnalysisContext blockStartContext)`
`111`	`111`	`return;`
`112`	`112`	`}`
`113`	`113`
`114`		`- bool isInstanceReferenced = methodSymbol.AssociatedSymbol.IsIndexer();`
	`114`	`+ bool isInstanceReferenced = false;`
`115`	`115`
`116`		`- if (!isInstanceReferenced)`
	`116`	`+ blockStartContext.RegisterOperationAction(operationContext =>`
`117`	`117`	`{`
`118`		`- blockStartContext.RegisterOperationAction(operationContext =>`
	`118`	`+ if (((IInstanceReferenceOperation)operationContext.Operation).ReferenceKind == InstanceReferenceKind.ContainingTypeInstance)`
`119`	`119`	`{`
`120`		`- if (((IInstanceReferenceOperation)operationContext.Operation).ReferenceKind == InstanceReferenceKind.ContainingTypeInstance)`
`121`		`- {`
`122`		`- isInstanceReferenced = true;`
`123`		`- }`
`124`		`- }, OperationKind.InstanceReference);`
`125`		`- }`
	`120`	`+ isInstanceReferenced = true;`
	`121`	`+ }`
	`122`	`+ }, OperationKind.InstanceReference);`
`126`	`123`
`127`	`124`	`blockStartContext.RegisterOperationBlockEndAction(blockEndContext =>`
`128`	`125`	`{`
`@@ -205,8 +202,8 @@ private static bool ShouldAnalyze(`
`205`	`202`	`return false;`
`206`	`203`	`}`
`207`	`204`
`208`		`- // Do not analyze constructors and finalizers.`
`209`		`- if (methodSymbol.IsConstructor() \|\| methodSymbol.IsFinalizer())`
	`205`	`+ // Do not analyze constructors, finalizers, and indexers.`
	`206`	`+ if (methodSymbol.IsConstructor() \|\| methodSymbol.IsFinalizer() \|\| methodSymbol.AssociatedSymbol.IsIndexer())`
`210`	`207`	`{`
`211`	`208`	`return false;`
`212`	`209`	`}`