Merge pull request #2051 from vweijsters/fix-2040

Fixed SA1205 issue with nested partial types

Author: sharwell

StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1205UnitTests.cs

@@ -162,6 +162,42 @@ public partial class Foo
             await this.VerifyCSharpFixAsync(testCode, fixedTestCode).ConfigureAwait(false);
         }
 
+        /// <summary>
+        /// Verifies that all 5 access modifiers are accepted for nested types.
+        /// This is a regression test for issue #2040.
+        /// </summary>
+        /// <param name="accessModifier">The access modifier to use for the nested type.</param>
+        /// <param name="typeKeyword">The type keyword to use.</param>
+        /// <returns>A <see cref="Task"/> representing the asynchronous unit test.</returns>
+        [Theory]
+        [InlineData("public", "class")]
+        [InlineData("protected", "class")]
+        [InlineData("internal", "class")]
+        [InlineData("protected internal", "class")]
+        [InlineData("private", "class")]
+        [InlineData("public", "struct")]
+        [InlineData("protected", "struct")]
+        [InlineData("internal", "struct")]
+        [InlineData("protected internal", "struct")]
+        [InlineData("private", "struct")]
+        public async Task TestNestedTypeAccessModifiersAsync(string accessModifier, string typeKeyword)
+        {
+            var testCode = $@"
+internal static partial class TestPartial
+{{
+    {accessModifier} partial {typeKeyword} PartialInner
+    {{
+        public int Do()
+        {{
+            return 2;
+        }}
+    }}
+}}
+";
+
+            await this.VerifyCSharpDiagnosticAsync(testCode, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
+        }
+
         /// <inheritdoc/>
         protected override IEnumerable<DiagnosticAnalyzer> GetCSharpDiagnosticAnalyzers()
         {

StyleCop.Analyzers/StyleCop.Analyzers/OrderingRules/SA1205PartialElementsMustDeclareAccess.cs

@@ -58,7 +58,9 @@ private static void HandleTypeDeclaration(SyntaxNodeAnalysisContext context)
             if (typeDeclarationNode.Modifiers.Any(SyntaxKind.PartialKeyword))
             {
                 if (!typeDeclarationNode.Modifiers.Any(SyntaxKind.PublicKeyword)
-                    && !typeDeclarationNode.Modifiers.Any(SyntaxKind.InternalKeyword))
+                    && !typeDeclarationNode.Modifiers.Any(SyntaxKind.InternalKeyword)
+                    && !typeDeclarationNode.Modifiers.Any(SyntaxKind.ProtectedKeyword)
+                    && !typeDeclarationNode.Modifiers.Any(SyntaxKind.PrivateKeyword))
                 {
                     context.ReportDiagnostic(Diagnostic.Create(Descriptor, typeDeclarationNode.Identifier.GetLocation()));
                 }