Merge pull request #2487 from sharwell/enum-line

Handle single-line enum declarations

Author: vweijsters

StyleCop.Analyzers/StyleCop.Analyzers.Test/MaintainabilityRules/SA1413UnitTests.cs

@@ -488,6 +488,24 @@ public async Task VerifyEnumWithoutTrailingCommaAsync()
             await this.VerifyCSharpFixAsync(testCode, fixedTestCode).ConfigureAwait(false);
         }
 
+        [Fact]
+        [WorkItem(2467, "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/2467")]
+        public async Task VerifySingleLineEnumWithoutCommaAsync()
+        {
+            // SA1413 is not reported whether or not the comma is included for single-line enums
+            var testCode = @"enum TestEnum { One, Two }";
+            await this.VerifyCSharpDiagnosticAsync(testCode, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
+        }
+
+        [Fact]
+        [WorkItem(2467, "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/2467")]
+        public async Task VerifySingleLineEnumWithCommaAsync()
+        {
+            // SA1413 is not reported whether or not the comma is included for single-line enums
+            var testCode = @"enum TestEnum { One, Two, }";
+            await this.VerifyCSharpDiagnosticAsync(testCode, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
+        }
+
         /// <summary>
         /// Verifies that the last value of an enum without a trailing comma produces a diagnostic.
         /// </summary>

StyleCop.Analyzers/StyleCop.Analyzers/MaintainabilityRules/SA1413UseTrailingCommasInMultiLineInitializers.cs

@@ -58,6 +58,7 @@ internal class SA1413UseTrailingCommasInMultiLineInitializers : DiagnosticAnalyz
 
         private static readonly Action<SyntaxNodeAnalysisContext> HandleObjectInitializerAction = HandleObjectInitializer;
         private static readonly Action<SyntaxNodeAnalysisContext> HandleAnonymousObjectInitializerAction = HandleAnonymousObjectInitializer;
+        private static readonly Action<SyntaxNodeAnalysisContext> HandleEnumDeclarationAction = HandleEnumDeclaration;
 
         private static readonly ImmutableArray<SyntaxKind> ObjectInitializerKinds =
             ImmutableArray.Create(SyntaxKind.ObjectInitializerExpression, SyntaxKind.ArrayInitializerExpression, SyntaxKind.CollectionInitializerExpression);
@@ -74,19 +75,19 @@ public override void Initialize(AnalysisContext context)
 
             context.RegisterSyntaxNodeAction(HandleObjectInitializerAction, ObjectInitializerKinds);
             context.RegisterSyntaxNodeAction(HandleAnonymousObjectInitializerAction, SyntaxKind.AnonymousObjectCreationExpression);
-            context.RegisterSyntaxNodeAction(HandleEnumMemberDeclarationAction, SyntaxKind.EnumDeclaration);
+            context.RegisterSyntaxNodeAction(HandleEnumDeclarationAction, SyntaxKind.EnumDeclaration);
         }
 
-        private static void HandleEnumMemberDeclarationAction(SyntaxNodeAnalysisContext context)
+        private static void HandleEnumDeclaration(SyntaxNodeAnalysisContext context)
         {
             var initializer = (EnumDeclarationSyntax)context.Node;
             var lastMember = initializer.Members.LastOrDefault();
-            if (lastMember == null)
+            if (lastMember == null || !initializer.SpansMultipleLines())
             {
                 return;
             }
 
-            if (initializer.Members.Count() != initializer.Members.SeparatorCount)
+            if (initializer.Members.Count != initializer.Members.SeparatorCount)
             {
                 context.ReportDiagnostic(Diagnostic.Create(Descriptor, lastMember.GetLocation()));
             }