Merge pull request #2863 from sharwell/effective-severity

Use DiagnosticDescriptor.GetEffectiveSeverity to check for suppressions

Author: vweijsters

StyleCop.Analyzers/StyleCop.Analyzers/Helpers/DiagnosticOptionsHelper.cs

@@ -6,6 +6,7 @@
 
 namespace StyleCop.Analyzers.Helpers
 {
+    using System;
     using System.Collections.Immutable;
     using Microsoft.CodeAnalysis;
     using Microsoft.CodeAnalysis.Diagnostics;
@@ -56,12 +57,12 @@ internal static bool IsAnalyzerSuppressed(this Compilation compilation, Diagnost
         /// <returns>True if the diagnostic is currently suppressed.</returns>
         internal static bool IsAnalyzerSuppressed(this CompilationOptions compilationOptions, DiagnosticDescriptor descriptor)
         {
-            switch (compilationOptions.SpecificDiagnosticOptions.GetValueOrDefault(descriptor.Id))
+            switch (descriptor.GetEffectiveSeverity(compilationOptions))
             {
             case ReportDiagnostic.Suppress:
                 return true;
             case ReportDiagnostic.Default:
-                return !descriptor.IsEnabledByDefault;
+                throw new InvalidOperationException("This should be unreachable.");
             default:
                 return false;
             }

StyleCop.Analyzers/StyleCop.Analyzers/NamingRules/SA1304NonPrivateReadonlyFieldsMustBeginWithUpperCaseLetter.cs

@@ -84,8 +84,7 @@ private static void HandleFieldDeclaration(SyntaxNodeAnalysisContext context)
             {
                 // SA1307 is taken precedence here. SA1307 should be reported if the field is accessible.
                 // So if SA1307 is enabled this diagnostic will only be reported for internal fields.
-                if (context.SemanticModel.Compilation.Options.SpecificDiagnosticOptions
-                    .GetValueOrDefault(SA1307AccessibleFieldsMustBeginWithUpperCaseLetter.DiagnosticId, ReportDiagnostic.Default) != ReportDiagnostic.Suppress)
+                if (!context.IsAnalyzerSuppressed(SA1307AccessibleFieldsMustBeginWithUpperCaseLetter.Descriptor))
                 {
                     return;
                 }

StyleCop.Analyzers/StyleCop.Analyzers/NamingRules/SA1307AccessibleFieldsMustBeginWithUpperCaseLetter.cs

@@ -37,8 +37,10 @@ internal class SA1307AccessibleFieldsMustBeginWithUpperCaseLetter : DiagnosticAn
         private const string Description = "The name of a public or internal field in C# does not begin with an upper-case letter.";
         private const string HelpLink = "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1307.md";
 
-        private static readonly DiagnosticDescriptor Descriptor =
+#pragma warning disable SA1202 // Elements should be ordered by access
+        internal static readonly DiagnosticDescriptor Descriptor =
             new DiagnosticDescriptor(DiagnosticId, Title, MessageFormat, AnalyzerCategory.NamingRules, DiagnosticSeverity.Warning, AnalyzerConstants.EnabledByDefault, Description, HelpLink);
+#pragma warning restore SA1202 // Elements should be ordered by access
 
         private static readonly Action<SyntaxNodeAnalysisContext> FieldDeclarationAction = HandleFieldDeclaration;