Fix SA1312 getting reported for event field declarations

Also added regression tests to related rules SA1306 and SA1313. Fixes DotNetAnalyzers#1340
sharwell · Aug 31, 2015 · c71608e · c71608e
1 parent 13682b5
commit c71608e
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 1 deletion.
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/NamingRules/SA1306UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/NamingRules/SA1306UnitTests.cs
@@ -44,6 +44,21 @@ public async Task TestThatDiagnosticIsNotReportedAsync(string modifiers)
             await this.VerifyCSharpDiagnosticAsync(string.Format(testCode, modifiers), EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
         }
 
+        [Fact]
+        public async Task TestThatDiagnosticIsNotReportedForEventFieldsAsync()
+        {
+            var testCode = @"using System;
+public class TypeName
+{
+    static event EventHandler bar;
+    static event EventHandler Bar;
+    event EventHandler car;
+    event EventHandler Car;
+}";
+
+            await this.VerifyCSharpDiagnosticAsync(testCode, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
+        }
+
         [Fact]
         public async Task TestThatDiagnosticIsNotReportedForParametersAsync()
         {

diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/NamingRules/SA1312UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/NamingRules/SA1312UnitTests.cs
@@ -39,6 +39,21 @@ public async Task TestThatDiagnosticIsNotReportedForFieldsAsync()
             await this.VerifyCSharpDiagnosticAsync(testCode, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
         }
 
+        [Fact]
+        public async Task TestThatDiagnosticIsNotReportedForEventFieldsAsync()
+        {
+            var testCode = @"using System;
+public class TypeName
+{
+    static event EventHandler bar;
+    static event EventHandler Bar;
+    event EventHandler car;
+    event EventHandler Car;
+}";
+
+            await this.VerifyCSharpDiagnosticAsync(testCode, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
+        }
+
         [Fact]
         public async Task TestThatDiagnosticIsNotReportedForParametersAsync()
         {

diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/NamingRules/SA1313UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/NamingRules/SA1313UnitTests.cs
@@ -25,6 +25,21 @@ public async Task TestThatDiagnosticIsNotReportedForFieldsAsync()
             await this.VerifyCSharpDiagnosticAsync(testCode, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
         }
 
+        [Fact]
+        public async Task TestThatDiagnosticIsNotReportedForEventFieldsAsync()
+        {
+            var testCode = @"using System;
+public class TypeName
+{
+    static event EventHandler bar;
+    static event EventHandler Bar;
+    event EventHandler car;
+    event EventHandler Car;
+}";
+
+            await this.VerifyCSharpDiagnosticAsync(testCode, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
+        }
+
         [Fact]
         public async Task TestThatDiagnosticIsNotReportedForVariablesAsync()
         {

diff --git a/...alyzers/StyleCop.Analyzers/NamingRules/SA1312VariableNamesMustBeginWithLowerCaseLetter.cs b/...alyzers/StyleCop.Analyzers/NamingRules/SA1312VariableNamesMustBeginWithLowerCaseLetter.cs
@@ -60,7 +60,8 @@ private static void HandleCompilationStart(CompilationStartAnalysisContext conte
         private static void HandleVariableDeclarationSyntax(SyntaxNodeAnalysisContext context)
         {
             VariableDeclarationSyntax syntax = (VariableDeclarationSyntax)context.Node;
-            if (syntax.Parent.IsKind(SyntaxKind.FieldDeclaration))
+            if (syntax.Parent.IsKind(SyntaxKind.FieldDeclaration)
+                || syntax.Parent.IsKind(SyntaxKind.EventFieldDeclaration))
             {
                 // This diagnostic is only for local variables.
                 return;