Merge pull request #3591 from bjornhellander/feature/sa1206-file

Update SA1206 to recognize modifier "file"

Author: sharwell

StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp11/OrderingRules/SA1206CSharp11CodeFixProviderUnitTests.cs

@@ -3,9 +3,25 @@
 
 namespace StyleCop.Analyzers.Test.CSharp11.OrderingRules
 {
+    using System.Threading;
+    using System.Threading.Tasks;
     using StyleCop.Analyzers.Test.CSharp10.OrderingRules;
+    using Xunit;
+    using static StyleCop.Analyzers.Test.Verifiers.StyleCopCodeFixVerifier<
+        StyleCop.Analyzers.OrderingRules.SA1206DeclarationKeywordsMustFollowOrder,
+        StyleCop.Analyzers.OrderingRules.SA1206CodeFixProvider>;
 
     public class SA1206CSharp11CodeFixProviderUnitTests : SA1206CSharp10CodeFixProviderUnitTests
     {
+        [Fact]
+        [WorkItem(3589, "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/3589")]
+        public async Task VerifyFileKeywordReorderingInClassDeclarationAsync()
+        {
+            var testCode = $"static unsafe {{|#0:file|}} class TestClass {{}}";
+            var fixedTestCode = $"file static unsafe class TestClass {{}}";
+
+            var expected = Diagnostic().WithLocation(0).WithArguments("file", "unsafe");
+            await VerifyCSharpFixAsync(testCode, expected, fixedTestCode, CancellationToken.None).ConfigureAwait(false);
+        }
     }
 }

StyleCop.Analyzers/StyleCop.Analyzers/Helpers/ModifierOrderHelper.cs

@@ -7,6 +7,7 @@ namespace StyleCop.Analyzers.OrderingRules
 {
     using Microsoft.CodeAnalysis;
     using Microsoft.CodeAnalysis.CSharp;
+    using StyleCop.Analyzers.Lightup;
 
     internal static class ModifierOrderHelper
     {
@@ -21,7 +22,7 @@ internal enum ModifierType
             None,
 
             /// <summary>
-            /// Represents any of access modifiers, i.e <see langword="public"/>, <see langword="protected"/>, <see langword="internal"/>, <see langword="private"/>.
+            /// Represents any of access modifiers, i.e <see langword="public"/>, <see langword="protected"/>, <see langword="internal"/>, <see langword="private"/>, <see langword="file"/>.
             /// </summary>
             Access,
 
@@ -46,6 +47,7 @@ internal static ModifierType GetModifierType(SyntaxToken modifier)
             case SyntaxKind.ProtectedKeyword:
             case SyntaxKind.InternalKeyword:
             case SyntaxKind.PrivateKeyword:
+            case SyntaxKindEx.FileKeyword:
                 result = ModifierType.Access;
                 break;