Fixed static class collisions in SA1101

Author: vweijsters

StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1101UnitTests.cs

@@ -306,6 +306,45 @@ public async Task TestPrefixLocalCallsWithThisCodeFixAsync()
             await this.VerifyCSharpFixAsync(ReferenceCode, fixedCode, cancellationToken: CancellationToken.None).ConfigureAwait(false);
         }
 
+        /// <summary>
+        /// Verifies that a collision between a member and a static member is handled properly.
+        /// This is a regression test for #2093
+        /// </summary>
+        /// <returns>A <see cref="Task"/> representing the asynchronous unit test.</returns>
+        [Fact]
+        public async Task TestNameCollisionForStaticMethodAsync()
+        {
+            var testCode = @"
+using System;
+
+public class TestClass
+{
+    public DateTime DateTime => DateTime.FromFileTime(0);
+}
+";
+
+            await this.VerifyCSharpDiagnosticAsync(testCode, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
+        }
+
+        /// <summary>
+        /// Verifies that a collision between a member and a static property is handled properly.
+        /// </summary>
+        /// <returns>A <see cref="Task"/> representing the asynchronous unit test.</returns>
+        [Fact]
+        public async Task TestNameCollisionForStaticPropertyAsync()
+        {
+            var testCode = @"
+using System;
+
+public class TestClass
+{
+    public DateTime DateTime => DateTime.UtcNow;
+}
+";
+
+            await this.VerifyCSharpDiagnosticAsync(testCode, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
+        }
+
         protected override IEnumerable<DiagnosticAnalyzer> GetCSharpDiagnosticAnalyzers()
         {
             yield return new SA1101PrefixLocalCallsWithThis();

StyleCop.Analyzers/StyleCop.Analyzers/ReadabilityRules/SA1101PrefixLocalCallsWithThis.cs

@@ -188,17 +188,25 @@ private static void HandleIdentifierNameImpl(SyntaxNodeAnalysisContext context,
                     return;
                 }
 
-                // This is a workaround for https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/1501 and can
-                // be removed when the underlying bug in roslyn is resolved
+                // This is a workaround for:
+                // - https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/1501
+                // - https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/2093
+                // and can be removed when the underlying bug in roslyn is resolved
                 if (nameExpression.Parent is MemberAccessExpressionSyntax)
                 {
-                    var parentSymbol = context.SemanticModel.GetSymbolInfo(nameExpression.Parent, context.CancellationToken).Symbol as IFieldSymbol;
+                    var memberAccessSymbol = context.SemanticModel.GetSymbolInfo(nameExpression.Parent, context.CancellationToken).Symbol;
 
-                    if (parentSymbol != null
-                        && parentSymbol.IsStatic
-                        && parentSymbol.ContainingType.Name == symbol.Name)
+                    switch (memberAccessSymbol.Kind)
                     {
-                        return;
+                        case SymbolKind.Field:
+                        case SymbolKind.Method:
+                        case SymbolKind.Property:
+                            if (memberAccessSymbol.IsStatic && (memberAccessSymbol.ContainingType.Name == symbol.Name))
+                            {
+                                return;
+                            }
+
+                            break;
                     }
                 }