Merge pull request #4650 from Youssef1313/patch-11

mavasani · web-flow · commit c49d1111702d · 2021-01-05T05:22:10.000-08:00
MarkMembersAsStatic: Exclude indexers
diff --git a/src/NetAnalyzers/Core/Microsoft.CodeQuality.Analyzers/QualityGuidelines/MarkMembersAsStatic.cs b/src/NetAnalyzers/Core/Microsoft.CodeQuality.Analyzers/QualityGuidelines/MarkMembersAsStatic.cs
@@ -202,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;
             }
diff --git a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/QualityGuidelines/MarkMembersAsStaticTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/QualityGuidelines/MarkMembersAsStaticTests.cs
@@ -335,6 +335,8 @@ public void SomeEventHandler(object sender, System.EventArgs args) { }
     public void SomeNotImplementedMethod() => throw new System.NotImplementedException();
 
     public void SomeNotSupportedMethod() => throw new System.NotSupportedException();
+
+    public int this[int x] => 42;
 }
 
 public class Generic<T>
@@ -394,6 +396,12 @@ End Sub
     Public Sub SomeNotSupportedMethod()
         Throw New System.NotSupportedException()
     End Sub
+
+    Default Public ReadOnly Property Item(x As Integer) As Integer
+        Get
+            Return 42
+        End Get
+    End Property
 End Class
 
 Public Class Generic(Of T)

Original file line number	Diff line number	Diff line change
`@@ -202,8 +202,8 @@ private static bool ShouldAnalyze(`
`202`	`202`	`return false;`
`203`	`203`	`}`
`204`	`204`
`205`		`- // Do not analyze constructors and finalizers.`
`206`		`- if (methodSymbol.IsConstructor() \|\| methodSymbol.IsFinalizer())`
	`205`	`+ // Do not analyze constructors, finalizers, and indexers.`
	`206`	`+ if (methodSymbol.IsConstructor() \|\| methodSymbol.IsFinalizer() \|\| methodSymbol.AssociatedSymbol.IsIndexer())`
`207`	`207`	`{`
`208`	`208`	`return false;`
`209`	`209`	`}`