Merge pull request #1846 from sharwell/fix-1778

Improve messaging for SA1205

Author: sharwell

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

@@ -12,8 +12,7 @@ namespace StyleCop.Analyzers.OrderingRules
     using Microsoft.CodeAnalysis.Diagnostics;
 
     /// <summary>
-    /// The partial element does not have an access modifier defined. StyleCop may not be able to determine the correct
-    /// placement of the elements in the file. Please declare an access modifier for all partial elements.
+    /// The partial element does not have an access modifier defined.
     /// </summary>
     /// <remarks>
     /// <para>A violation of this rule occurs when the partial elements does not have an access modifier defined.</para>
@@ -27,7 +26,7 @@ internal class SA1205PartialElementsMustDeclareAccess : DiagnosticAnalyzer
         public const string DiagnosticId = "SA1205";
         private const string Title = "Partial elements must declare access";
         private const string MessageFormat = "Partial elements must declare an access modifier";
-        private const string Description = "The partial element does not have an access modifier defined. StyleCop may not be able to determine the correct placement of the elements in the file. Please declare an access modifier for all partial elements.";
+        private const string Description = "The partial element does not have an access modifier defined.";
         private const string HelpLink = "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1205.md";
 
         private static readonly DiagnosticDescriptor Descriptor =
@@ -58,19 +57,14 @@ private static void HandleTypeDeclaration(SyntaxNodeAnalysisContext context)
         {
             var typeDeclarationNode = (TypeDeclarationSyntax)context.Node;
 
-            if (ContainsModifier(typeDeclarationNode.Modifiers, SyntaxKind.PartialKeyword))
+            if (typeDeclarationNode.Modifiers.Any(SyntaxKind.PartialKeyword))
             {
-                if (!ContainsModifier(typeDeclarationNode.Modifiers, SyntaxKind.PublicKeyword) &&
-                    !ContainsModifier(typeDeclarationNode.Modifiers, SyntaxKind.InternalKeyword))
+                if (!typeDeclarationNode.Modifiers.Any(SyntaxKind.PublicKeyword)
+                    && !typeDeclarationNode.Modifiers.Any(SyntaxKind.InternalKeyword))
                 {
                     context.ReportDiagnostic(Diagnostic.Create(Descriptor, typeDeclarationNode.Identifier.GetLocation()));
                 }
             }
         }
-
-        private static bool ContainsModifier(SyntaxTokenList modifiers, SyntaxKind expectedKeyword)
-        {
-            return modifiers.Any(modifier => modifier.Kind() == expectedKeyword);
-        }
     }
 }

documentation/SA1205.md

@@ -17,16 +17,15 @@
 
 ## Cause
 
-The partial element does not have an access modifier defined. StyleCop may not be able to determine the correct
-          placement of the elements in the file. Please declare an access modifier for all partial elements.
+The partial element does not have an access modifier defined.
 
 ## Rule description
 
 A violation of this rule occurs when the partial elements does not have an access modifier defined.
 
 ## How to fix violations
 
-To fix an instance of this violation, specify an acess modifier for the partial element.
+To fix an instance of this violation, specify an access modifier for the partial element.
 
 ## How to suppress violations