Merge pull request #1232 from Noryoko/fix-1230

Fix SA1024 incorrectly treating explicit interface implementations as private
DotNetAnalyzers · Aug 17, 2015 · 72002b5 · 72002b5
2 parents b121114 + db8f554
commit 72002b5
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 1 deletion.
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1202UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1202UnitTests.cs
@@ -607,6 +607,32 @@ void IA.TestMethod1() { }
             await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
         }
 
+        [Fact]
+        public async Task TestExplicitInterfaceFollowedByPrivateStaticAsync()
+        {
+            var testCode = @"
+public interface TestInterface
+{
+    void SomeMethod();
+}
+
+public class TestClass : TestInterface
+{
+    private static void ExampleMethod()
+    {
+    }
+
+    void TestInterface.SomeMethod()
+    {
+    }
+}
+";
+
+            var expected = this.CSharpDiagnostic().WithLocation(13, 24).WithArguments("public", "methods", "private");
+
+            await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
+        }
+
         /// <summary>
         /// Verifies that the analyzer will properly handle incomplete members.
         /// </summary>

diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1204UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1204UnitTests.cs
@@ -351,6 +351,30 @@ public MyClass2()
             await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
         }
 
+        [Fact]
+        public async Task TestExplicitInterfaceFollowedByPrivateStaticAsync()
+        {
+            var testCode = @"
+public interface TestInterface
+{
+    void SomeMethod();
+}
+
+public class TestClass : TestInterface
+{
+    void TestInterface.SomeMethod()
+    {
+    }
+
+    private static void ExampleMethod()
+    {
+    }
+}
+";
+
+            await this.VerifyCSharpDiagnosticAsync(testCode, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
+        }
+
         /// <summary>
         /// Verifies that the analyzer will properly incomplete members.
         /// </summary>

diff --git a/.../StyleCop.Analyzers/OrderingRules/SA1204StaticElementsMustAppearBeforeInstanceElements.cs b/.../StyleCop.Analyzers/OrderingRules/SA1204StaticElementsMustAppearBeforeInstanceElements.cs
@@ -104,7 +104,10 @@ private static void HandleMemberList(SyntaxNodeAnalysisContext context, SyntaxLi
                 var currentMemberStatic = modifiers.Any(SyntaxKind.StaticKeyword);
                 var currentMemberConst = modifiers.Any(SyntaxKind.ConstKeyword);
                 AccessLevel currentAccessLevel;
-                if (currentMemberStatic && currentSyntaxKind == SyntaxKind.ConstructorDeclaration)
+                if ((currentSyntaxKind == SyntaxKind.ConstructorDeclaration && modifiers.Any(SyntaxKind.StaticKeyword))
+                    || (currentSyntaxKind == SyntaxKind.MethodDeclaration && (member as MethodDeclarationSyntax)?.ExplicitInterfaceSpecifier != null)
+                    || (currentSyntaxKind == SyntaxKind.PropertyDeclaration && (member as PropertyDeclarationSyntax)?.ExplicitInterfaceSpecifier != null)
+                    || (currentSyntaxKind == SyntaxKind.IndexerDeclaration && (member as IndexerDeclarationSyntax)?.ExplicitInterfaceSpecifier != null))
                 {
                     currentAccessLevel = AccessLevel.Public;
                 }