Merge pull request #3936 from FantasyTeddy/relaxed-sa1516

Do not report SA1516 for two consecutive single line properties

Author: sharwell

StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1516UnitTests.cs

@@ -32,7 +32,6 @@ public class Bar
         public string Test3;
 
         public string TestProperty1 { get; set; }
-
         public string TestProperty2 { get; set; }
         /// <summary>
         /// A summary.
@@ -149,7 +148,6 @@ class Foo { }
                 Diagnostic().WithLocation(2, 1),
                 Diagnostic().WithLocation(5, 1),
                 Diagnostic().WithLocation(12, 1),
-                Diagnostic().WithLocation(13, 1),
                 Diagnostic().WithLocation(18, 1),
                 Diagnostic().WithLocation(24, 1),
                 Diagnostic().WithLocation(29, 1),

StyleCop.Analyzers/StyleCop.Analyzers/LayoutRules/SA1516ElementsMustBeSeparatedByBlankLine.cs

@@ -346,33 +346,53 @@ private static void HandleMemberList(SyntaxNodeAnalysisContext context, SyntaxLi
                 if (!members[i - 1].ContainsDiagnostics && !members[i].ContainsDiagnostics)
                 {
                     // Report if
-                    // the current declaration is not a field declaration
+                    // the current declaration is not a field declaration or property declaration
                     // or the previous declaration is of different type
                     // or the previous declaration spans across multiple lines
                     //
-                    // Note that the order of checking is important, as the call to IsMultiLine requires a FieldDeclarationSyntax,
-                    // something that can only be guaranteed if the first two checks fail.
-                    if (!members[i].IsKind(SyntaxKind.FieldDeclaration)
-                        || !members[i - 1].IsKind(members[i].Kind())
-                        || IsMultiline((FieldDeclarationSyntax)members[i - 1]))
+                    // Note that the order of checking is important, as the call to IsMultiLine requires a
+                    // FieldDeclarationSyntax or PropertyDeclarationSyntax, something that can only be guaranteed if the
+                    // first two checks fail.
+                    if (members[i].IsKind(SyntaxKind.FieldDeclaration)
+                        && members[i - 1].IsKind(members[i].Kind())
+                        && !IsMultiline((FieldDeclarationSyntax)members[i - 1]))
                     {
-                        ReportIfThereIsNoBlankLine(context, members[i - 1], members[i]);
+                        continue;
+                    }
+
+                    if (members[i].IsKind(SyntaxKind.PropertyDeclaration)
+                        && members[i - 1].IsKind(members[i].Kind())
+                        && !IsMultiline((PropertyDeclarationSyntax)members[i])
+                        && !IsMultiline((PropertyDeclarationSyntax)members[i - 1]))
+                    {
+                        continue;
                     }
+
+                    ReportIfThereIsNoBlankLine(context, members[i - 1], members[i]);
                 }
             }
         }
 
         private static bool IsMultiline(FieldDeclarationSyntax fieldDeclaration)
         {
-            var lineSpan = fieldDeclaration.GetLineSpan();
-            var attributeLists = fieldDeclaration.AttributeLists;
+            return IsMultiline(fieldDeclaration, fieldDeclaration.AttributeLists);
+        }
+
+        private static bool IsMultiline(PropertyDeclarationSyntax propertyDeclaration)
+        {
+            return IsMultiline(propertyDeclaration, propertyDeclaration.AttributeLists);
+        }
+
+        private static bool IsMultiline(MemberDeclarationSyntax memberDeclaration, SyntaxList<AttributeListSyntax> attributeLists)
+        {
+            var lineSpan = memberDeclaration.GetLineSpan();
 
             int startLine;
 
             // Exclude attributes when determining if a field declaration spans multiple lines
             if (attributeLists.Count > 0)
             {
-                var lastAttributeSpan = fieldDeclaration.SyntaxTree.GetLineSpan(attributeLists.Last().FullSpan);
+                var lastAttributeSpan = memberDeclaration.SyntaxTree.GetLineSpan(attributeLists.Last().FullSpan);
                 startLine = lastAttributeSpan.EndLinePosition.Line;
             }
             else