Fix failure to sort record kinds correctly

Author: sharwell

StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1201UnitTests.cs

@@ -1,13 +1,14 @@
 // Copyright (c) Tunnel Vision Laboratories, LLC. All Rights Reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
-#nullable disable
-
 namespace StyleCop.Analyzers.Test.OrderingRules
 {
+    using System.Collections.Generic;
+    using System.Linq;
     using System.Threading;
     using System.Threading.Tasks;
     using Microsoft.CodeAnalysis.Testing;
+    using StyleCop.Analyzers.Test.Helpers;
     using Xunit;
 
     using static StyleCop.Analyzers.Test.Verifiers.StyleCopCodeFixVerifier<
@@ -16,6 +17,20 @@ namespace StyleCop.Analyzers.Test.OrderingRules
 
     public class SA1201UnitTests
     {
+        public static IEnumerable<object[]> ValueTypesAndReferenceTypes
+        {
+            get
+            {
+                foreach (var valueTypeKeyword in CommonMemberData.ValueTypeDeclarationKeywords)
+                {
+                    foreach (var referenceTypeKeyword in CommonMemberData.ReferenceTypeDeclarationKeywords)
+                    {
+                        yield return new object[] { valueTypeKeyword.Single(), referenceTypeKeyword.Single() };
+                    }
+                }
+            }
+        }
+
         [Fact]
         public async Task TestOuterOrderCorrectOrderAsync()
         {
@@ -52,6 +67,35 @@ public struct FooStruct { }
             await VerifyCSharpDiagnosticAsync("namespace OuterNamespace { " + testCode + " }", expected, CancellationToken.None).ConfigureAwait(false);
         }
 
+        [Theory]
+        [MemberData(nameof(ValueTypesAndReferenceTypes))]
+        public async Task TestClassBeforeStructAsync(
+            string structKeyword,
+            string classKeyword)
+        {
+            string testCode = $@"
+public {classKeyword} FooClass {{ }}
+public {structKeyword} {{|#0:FooStruct|}} {{ }}
+";
+            string fixedCode = $@"public {structKeyword} FooStruct {{ }}
+
+public {classKeyword} FooClass {{ }}
+";
+
+            var reportedClassKind = classKeyword switch
+            {
+                "record class" => "record",
+                _ => classKeyword,
+            };
+
+            var expected = new[]
+            {
+                Diagnostic().WithLocation(0).WithArguments(structKeyword, reportedClassKind),
+            };
+
+            await VerifyCSharpFixAsync(testCode, expected, fixedCode, CancellationToken.None).ConfigureAwait(false);
+        }
+
         [Fact]
         public async Task TestTypeMemberOrderCorrectOrderClassAsync()
         {

StyleCop.Analyzers/StyleCop.Analyzers/Helpers/MemberOrderHelper.cs

@@ -1,8 +1,6 @@
 // Copyright (c) Tunnel Vision Laboratories, LLC. All Rights Reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
-#nullable disable
-
 namespace StyleCop.Analyzers.Helpers
 {
     using System;
@@ -16,7 +14,7 @@ namespace StyleCop.Analyzers.Helpers
     /// <summary>
     /// Helper for dealing with member priority.
     /// </summary>
-    internal struct MemberOrderHelper
+    internal readonly struct MemberOrderHelper
     {
         private static readonly ImmutableArray<SyntaxKind> TypeMemberOrder = ImmutableArray.Create(
             SyntaxKind.ClassDeclaration,
@@ -44,8 +42,13 @@ internal MemberOrderHelper(MemberDeclarationSyntax member, ImmutableArray<Orderi
         {
             this.Member = member;
             var modifiers = member.GetModifiers();
-            var type = member.Kind();
-            type = type == SyntaxKind.EventFieldDeclaration ? SyntaxKind.EventDeclaration : type;
+            var type = member.Kind() switch
+            {
+                SyntaxKind.EventFieldDeclaration => SyntaxKind.EventDeclaration,
+                SyntaxKindEx.RecordDeclaration => SyntaxKind.ClassDeclaration,
+                SyntaxKindEx.RecordStructDeclaration => SyntaxKind.StructDeclaration,
+                var kind => kind,
+            };
 
             this.Priority = 0;
             foreach (OrderingTrait trait in elementOrder)