diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Helpers/UseCultureAttribute.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/Helpers/UseCultureAttribute.cs index 3ab946164..78153d899 100755 --- a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Helpers/UseCultureAttribute.cs +++ b/StyleCop.Analyzers/StyleCop.Analyzers.Test/Helpers/UseCultureAttribute.cs @@ -27,9 +27,11 @@ public class UseCultureAttribute : BeforeAfterTestAttribute { private readonly Lazy culture; +#pragma warning disable IDE0079 // Remove unnecessary suppression #pragma warning disable SA1305 // Field names should not use Hungarian notation private readonly Lazy uiCulture; #pragma warning restore SA1305 // Field names should not use Hungarian notation +#pragma warning restore IDE0079 // Remove unnecessary suppression private CultureInfo originalCulture; @@ -55,6 +57,7 @@ public UseCultureAttribute(string culture) { } +#pragma warning disable IDE0079 // Remove unnecessary suppression #pragma warning disable SA1305 // Field names should not use Hungarian notation /// /// Initializes a new instance of the @@ -64,6 +67,7 @@ public UseCultureAttribute(string culture) /// The name of the UI culture. public UseCultureAttribute(string culture, string uiCulture) #pragma warning restore SA1305 // Field names should not use Hungarian notation +#pragma warning restore IDE0079 // Remove unnecessary suppression { this.culture = new Lazy(() => new CultureInfo(culture)); this.uiCulture = new Lazy(() => new CultureInfo(uiCulture)); diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LightJson/JsonObjectTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/LightJson/JsonObjectTests.cs index 9652daec1..4bfca9b85 100644 --- a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LightJson/JsonObjectTests.cs +++ b/StyleCop.Analyzers/StyleCop.Analyzers.Test/LightJson/JsonObjectTests.cs @@ -140,8 +140,10 @@ public void TestDebugView() } } +#pragma warning disable IDE0079 // Remove unnecessary suppression #pragma warning disable IDE0060 // Remove unused parameter private static Type StaticType(T value) => typeof(T); #pragma warning restore IDE0060 // Remove unused parameter +#pragma warning restore IDE0079 // Remove unnecessary suppression } } diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1116UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1116UnitTests.cs index f6f2c9290..79df5a633 100644 --- a/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1116UnitTests.cs +++ b/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1116UnitTests.cs @@ -5,9 +5,11 @@ // Several test methods in this file use the same member data, but in some cases the test does not use all of the // supported parameters. See https://github.com/xunit/xunit/issues/1556. +#pragma warning disable IDE0079 // Remove unnecessary suppression #pragma warning disable xUnit1026 // Theory methods should use all of their parameters namespace StyleCop.Analyzers.Test.ReadabilityRules +#pragma warning restore IDE0079 // Remove unnecessary suppression { using System.Collections.Generic; using System.Threading; diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1121UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1121UnitTests.cs index 05d0f858a..4d8528f7d 100644 --- a/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1121UnitTests.cs +++ b/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1121UnitTests.cs @@ -5,9 +5,11 @@ // Several test methods in this file use the same member data, but in some cases the test does not use all of the // supported parameters. See https://github.com/xunit/xunit/issues/1556. +#pragma warning disable IDE0079 // Remove unnecessary suppression #pragma warning disable xUnit1026 // Theory methods should use all of their parameters namespace StyleCop.Analyzers.Test.ReadabilityRules +#pragma warning restore IDE0079 // Remove unnecessary suppression { using System; using System.Collections.Generic; diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1130UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1130UnitTests.cs index f91c1aff1..1bcec97b5 100644 --- a/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1130UnitTests.cs +++ b/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1130UnitTests.cs @@ -19,11 +19,15 @@ namespace StyleCop.Analyzers.Test.ReadabilityRules public class SA1130UnitTests { +#pragma warning disable IDE0079 // Remove unnecessary suppression [SuppressMessage("MicrosoftCodeAnalysisDesign", "RS1032:Define diagnostic message correctly", Justification = "The message here matches the compiler.")] +#pragma warning restore IDE0079 // Remove unnecessary suppression private static readonly DiagnosticDescriptor CS1065 = new DiagnosticDescriptor(nameof(CS1065), "Title", "Default values are not valid in this context.", "Category", DiagnosticSeverity.Error, AnalyzerConstants.EnabledByDefault); +#pragma warning disable IDE0079 // Remove unnecessary suppression [SuppressMessage("MicrosoftCodeAnalysisDesign", "RS1032:Define diagnostic message correctly", Justification = "The message here matches the compiler.")] +#pragma warning restore IDE0079 // Remove unnecessary suppression private static readonly DiagnosticDescriptor CS7014 = new DiagnosticDescriptor(nameof(CS7014), "Title", "Attributes are not valid in this context.", "Category", DiagnosticSeverity.Error, AnalyzerConstants.EnabledByDefault); diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/AnalyzerConstants.cs b/StyleCop.Analyzers/StyleCop.Analyzers/AnalyzerConstants.cs index 6a03e7f25..67d36bcfc 100644 --- a/StyleCop.Analyzers/StyleCop.Analyzers/AnalyzerConstants.cs +++ b/StyleCop.Analyzers/StyleCop.Analyzers/AnalyzerConstants.cs @@ -9,44 +9,35 @@ namespace StyleCop.Analyzers internal static class AnalyzerConstants { /// - /// Gets a reference value which can be passed to - /// - /// to indicate that the diagnostic is disabled by default because it is an alternative to a reference StyleCop - /// rule. + /// Gets a value indicating whether the diagnostic is disabled by default because it is an alternative to a standard + /// StyleCop rule. It is used with + /// . /// /// - /// A reference value which can be passed to - /// - /// to indicate that the diagnostic is disabled by default because it is an alternative to a reference StyleCop - /// rule. + /// A value indicating the diagnostic is disabled by default because it is an alternative to a standard StyleCop rule. + /// It is used with + /// . /// - [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1623:Property summary documentation should match accessors.", Justification = "This property behaves more like an opaque value than a Boolean.")] internal static bool DisabledAlternative => false; /// - /// Gets a reference value which can be passed to - /// - /// to indicate that the diagnostic should be enabled by default. + /// Gets a value indicating whether the diagnostic should be enabled by default. It is used with + /// . /// /// - /// A reference value which can be passed to - /// - /// to indicate that the diagnostic should be enabled by default. + /// A value indicating whether the diagnostic should be enabled by default. It is used with + /// . /// - [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1623:Property summary documentation should match accessors.", Justification = "This property behaves more like an opaque value than a Boolean.")] internal static bool EnabledByDefault => true; /// - /// Gets a reference value which can be passed to - /// - /// to indicate that the diagnostic should be disabled by default. + /// Gets a value indicating whether the diagnostic should be disabled by default. It is used with + /// . /// /// - /// A reference value which can be passed to - /// - /// to indicate that the diagnostic should be disabled by default. + /// A value indicating whether the diagnostic should be disabled by default. It is used with + /// . /// - [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1623:Property summary documentation should match accessors.", Justification = "This property behaves more like an opaque value than a Boolean.")] internal static bool DisabledByDefault => false; } } diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/AnalyzerExtensions.cs b/StyleCop.Analyzers/StyleCop.Analyzers/AnalyzerExtensions.cs index 07fbe6869..65c33046d 100644 --- a/StyleCop.Analyzers/StyleCop.Analyzers/AnalyzerExtensions.cs +++ b/StyleCop.Analyzers/StyleCop.Analyzers/AnalyzerExtensions.cs @@ -25,7 +25,6 @@ internal static class AnalyzerExtensions /// /// The analysis context. /// Action to be executed at completion of parsing of a document. - [SuppressMessage("MicrosoftCodeAnalysisPerformance", "RS1012:Start action has no registered actions", Justification = "This is not a start action")] public static void RegisterSyntaxTreeAction(this CompilationStartAnalysisContext context, Action action) { var settingsFile = context.GetStyleCopSettingsFile(context.CancellationToken); @@ -69,7 +68,6 @@ public static void RegisterSyntaxNodeAction(this CompilationS /// The kinds of syntax that should be analyzed. /// Enum type giving the syntax node kinds of the source language for which /// the action applies. - [SuppressMessage("MicrosoftCodeAnalysisPerformance", "RS1012:Start action has no registered actions", Justification = "This is not a start action")] public static void RegisterSyntaxNodeAction(this CompilationStartAnalysisContext context, Action action, ImmutableArray syntaxKinds) where TLanguageKindEnum : struct { diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/DocumentationRules/SA1603DocumentationMustContainValidXml.cs b/StyleCop.Analyzers/StyleCop.Analyzers/DocumentationRules/SA1603DocumentationMustContainValidXml.cs index ce392c560..91d9d70c0 100644 --- a/StyleCop.Analyzers/StyleCop.Analyzers/DocumentationRules/SA1603DocumentationMustContainValidXml.cs +++ b/StyleCop.Analyzers/StyleCop.Analyzers/DocumentationRules/SA1603DocumentationMustContainValidXml.cs @@ -33,20 +33,24 @@ internal class SA1603DocumentationMustContainValidXml : DiagnosticAnalyzer private static readonly LocalizableString Description = new LocalizableResourceString(nameof(DocumentationResources.SA1603Description), DocumentationResources.ResourceManager, typeof(DocumentationResources)); private static readonly DiagnosticDescriptor Descriptor = +#pragma warning disable IDE0079 // Remove unnecessary suppression #pragma warning disable RS2000 // Add analyzer diagnostic IDs to analyzer release. new DiagnosticDescriptor(DiagnosticId, Title, MessageFormat, AnalyzerCategory.DocumentationRules, DiagnosticSeverity.Warning, AnalyzerConstants.DisabledByDefault, Description, HelpLink, WellKnownDiagnosticTags.NotConfigurable); #pragma warning restore RS2000 // Add analyzer diagnostic IDs to analyzer release. +#pragma warning restore IDE0079 // Remove unnecessary suppression /// public override ImmutableArray SupportedDiagnostics { get; } = ImmutableArray.Create(Descriptor); /// +#pragma warning disable IDE0079 // Remove unnecessary suppression #pragma warning disable RS1025 // Configure generated code analysis #pragma warning disable RS1026 // Enable concurrent execution public override void Initialize(AnalysisContext context) #pragma warning restore RS1026 // Enable concurrent execution #pragma warning restore RS1025 // Configure generated code analysis +#pragma warning restore IDE0079 // Remove unnecessary suppression { // This diagnostic is not implemented (by design) in StyleCopAnalyzers. } diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/DocumentationRules/SA1612ElementParameterDocumentationMustMatchElementParameters.cs b/StyleCop.Analyzers/StyleCop.Analyzers/DocumentationRules/SA1612ElementParameterDocumentationMustMatchElementParameters.cs index ef6d94c0c..9e29bfa3a 100644 --- a/StyleCop.Analyzers/StyleCop.Analyzers/DocumentationRules/SA1612ElementParameterDocumentationMustMatchElementParameters.cs +++ b/StyleCop.Analyzers/StyleCop.Analyzers/DocumentationRules/SA1612ElementParameterDocumentationMustMatchElementParameters.cs @@ -112,6 +112,7 @@ protected override void HandleXmlElement(SyntaxNodeAnalysisContext context, Styl if (parentParameters.Length <= index || parentParameters[index] != parentParameter) { +#pragma warning disable IDE0079 // Remove unnecessary suppression #pragma warning disable RS1005 // ReportDiagnostic invoked with an unsupported DiagnosticDescriptor (https://github.com/dotnet/roslyn-analyzers/issues/4103) context.ReportDiagnostic( Diagnostic.Create( @@ -120,6 +121,7 @@ protected override void HandleXmlElement(SyntaxNodeAnalysisContext context, Styl nameAttributeText, parentParameters.IndexOf(parentParameter) + 1)); #pragma warning restore RS1005 // ReportDiagnostic invoked with an unsupported DiagnosticDescriptor +#pragma warning restore IDE0079 // Remove unnecessary suppression } } @@ -185,6 +187,7 @@ protected override void HandleCompleteDocumentation(SyntaxNodeAnalysisContext co if (parentParameters.Length <= index || parentParameters[index] != parentParameter) { +#pragma warning disable IDE0079 // Remove unnecessary suppression #pragma warning disable RS1005 // ReportDiagnostic invoked with an unsupported DiagnosticDescriptor (https://github.com/dotnet/roslyn-analyzers/issues/4103) context.ReportDiagnostic( Diagnostic.Create( @@ -193,6 +196,7 @@ protected override void HandleCompleteDocumentation(SyntaxNodeAnalysisContext co nameAttributeText, parentParameters.IndexOf(parentParameter) + 1)); #pragma warning restore RS1005 // ReportDiagnostic invoked with an unsupported DiagnosticDescriptor +#pragma warning restore IDE0079 // Remove unnecessary suppression } } diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/DocumentationRules/SA1628DocumentationTextMustBeginWithACapitalLetter.cs b/StyleCop.Analyzers/StyleCop.Analyzers/DocumentationRules/SA1628DocumentationTextMustBeginWithACapitalLetter.cs index 17b49cacc..68a73383a 100644 --- a/StyleCop.Analyzers/StyleCop.Analyzers/DocumentationRules/SA1628DocumentationTextMustBeginWithACapitalLetter.cs +++ b/StyleCop.Analyzers/StyleCop.Analyzers/DocumentationRules/SA1628DocumentationTextMustBeginWithACapitalLetter.cs @@ -49,20 +49,24 @@ internal class SA1628DocumentationTextMustBeginWithACapitalLetter : DiagnosticAn private static readonly LocalizableString Description = new LocalizableResourceString(nameof(DocumentationResources.SA1628Description), DocumentationResources.ResourceManager, typeof(DocumentationResources)); private static readonly DiagnosticDescriptor Descriptor = +#pragma warning disable IDE0079 // Remove unnecessary suppression #pragma warning disable RS2000 // Add analyzer diagnostic IDs to analyzer release. new DiagnosticDescriptor(DiagnosticId, Title, MessageFormat, AnalyzerCategory.DocumentationRules, DiagnosticSeverity.Warning, AnalyzerConstants.DisabledByDefault, Description, HelpLink, WellKnownDiagnosticTags.NotConfigurable); #pragma warning restore RS2000 // Add analyzer diagnostic IDs to analyzer release. +#pragma warning restore IDE0079 // Remove unnecessary suppression /// public override ImmutableArray SupportedDiagnostics { get; } = ImmutableArray.Create(Descriptor); /// +#pragma warning disable IDE0079 // Remove unnecessary suppression #pragma warning disable RS1025 // Configure generated code analysis #pragma warning disable RS1026 // Enable concurrent execution public override void Initialize(AnalysisContext context) #pragma warning restore RS1026 // Enable concurrent execution #pragma warning restore RS1025 // Configure generated code analysis +#pragma warning restore IDE0079 // Remove unnecessary suppression { // This diagnostic is not implemented (by design) in StyleCopAnalyzers. } diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/DocumentationRules/SA1630DocumentationTextMustContainWhitespace.cs b/StyleCop.Analyzers/StyleCop.Analyzers/DocumentationRules/SA1630DocumentationTextMustContainWhitespace.cs index 7297caa7c..69ccd6bd9 100644 --- a/StyleCop.Analyzers/StyleCop.Analyzers/DocumentationRules/SA1630DocumentationTextMustContainWhitespace.cs +++ b/StyleCop.Analyzers/StyleCop.Analyzers/DocumentationRules/SA1630DocumentationTextMustContainWhitespace.cs @@ -49,20 +49,24 @@ internal class SA1630DocumentationTextMustContainWhitespace : DiagnosticAnalyzer private static readonly LocalizableString Description = new LocalizableResourceString(nameof(DocumentationResources.SA1630Description), DocumentationResources.ResourceManager, typeof(DocumentationResources)); private static readonly DiagnosticDescriptor Descriptor = +#pragma warning disable IDE0079 // Remove unnecessary suppression #pragma warning disable RS2000 // Add analyzer diagnostic IDs to analyzer release. new DiagnosticDescriptor(DiagnosticId, Title, MessageFormat, AnalyzerCategory.DocumentationRules, DiagnosticSeverity.Warning, AnalyzerConstants.DisabledByDefault, Description, HelpLink, WellKnownDiagnosticTags.NotConfigurable); #pragma warning restore RS2000 // Add analyzer diagnostic IDs to analyzer release. +#pragma warning restore IDE0079 // Remove unnecessary suppression /// public override ImmutableArray SupportedDiagnostics { get; } = ImmutableArray.Create(Descriptor); /// +#pragma warning disable IDE0079 // Remove unnecessary suppression #pragma warning disable RS1025 // Configure generated code analysis #pragma warning disable RS1026 // Enable concurrent execution public override void Initialize(AnalysisContext context) #pragma warning restore RS1026 // Enable concurrent execution #pragma warning restore RS1025 // Configure generated code analysis +#pragma warning restore IDE0079 // Remove unnecessary suppression { // This diagnostic is not implemented (by design) in StyleCopAnalyzers. } diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/DocumentationRules/SA1631DocumentationMustMeetCharacterPercentage.cs b/StyleCop.Analyzers/StyleCop.Analyzers/DocumentationRules/SA1631DocumentationMustMeetCharacterPercentage.cs index ad8faba8e..8a264a4a6 100644 --- a/StyleCop.Analyzers/StyleCop.Analyzers/DocumentationRules/SA1631DocumentationMustMeetCharacterPercentage.cs +++ b/StyleCop.Analyzers/StyleCop.Analyzers/DocumentationRules/SA1631DocumentationMustMeetCharacterPercentage.cs @@ -50,20 +50,24 @@ internal class SA1631DocumentationMustMeetCharacterPercentage : DiagnosticAnalyz private static readonly LocalizableString Description = new LocalizableResourceString(nameof(DocumentationResources.SA1631Description), DocumentationResources.ResourceManager, typeof(DocumentationResources)); private static readonly DiagnosticDescriptor Descriptor = +#pragma warning disable IDE0079 // Remove unnecessary suppression #pragma warning disable RS2000 // Add analyzer diagnostic IDs to analyzer release. new DiagnosticDescriptor(DiagnosticId, Title, MessageFormat, AnalyzerCategory.DocumentationRules, DiagnosticSeverity.Warning, AnalyzerConstants.DisabledByDefault, Description, HelpLink, WellKnownDiagnosticTags.NotConfigurable); #pragma warning restore RS2000 // Add analyzer diagnostic IDs to analyzer release. +#pragma warning restore IDE0079 // Remove unnecessary suppression /// public override ImmutableArray SupportedDiagnostics { get; } = ImmutableArray.Create(Descriptor); /// +#pragma warning disable IDE0079 // Remove unnecessary suppression #pragma warning disable RS1025 // Configure generated code analysis #pragma warning disable RS1026 // Enable concurrent execution public override void Initialize(AnalysisContext context) #pragma warning restore RS1026 // Enable concurrent execution #pragma warning restore RS1025 // Configure generated code analysis +#pragma warning restore IDE0079 // Remove unnecessary suppression { // This diagnostic is not implemented (by design) in StyleCopAnalyzers. } diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/DocumentationRules/SA1632DocumentationTextMustMeetMinimumCharacterLength.cs b/StyleCop.Analyzers/StyleCop.Analyzers/DocumentationRules/SA1632DocumentationTextMustMeetMinimumCharacterLength.cs index ab617c4c9..b627ec09c 100644 --- a/StyleCop.Analyzers/StyleCop.Analyzers/DocumentationRules/SA1632DocumentationTextMustMeetMinimumCharacterLength.cs +++ b/StyleCop.Analyzers/StyleCop.Analyzers/DocumentationRules/SA1632DocumentationTextMustMeetMinimumCharacterLength.cs @@ -48,20 +48,24 @@ internal class SA1632DocumentationTextMustMeetMinimumCharacterLength : Diagnosti private static readonly LocalizableString Description = new LocalizableResourceString(nameof(DocumentationResources.SA1632Description), DocumentationResources.ResourceManager, typeof(DocumentationResources)); private static readonly DiagnosticDescriptor Descriptor = +#pragma warning disable IDE0079 // Remove unnecessary suppression #pragma warning disable RS2000 // Add analyzer diagnostic IDs to analyzer release. new DiagnosticDescriptor(DiagnosticId, Title, MessageFormat, AnalyzerCategory.DocumentationRules, DiagnosticSeverity.Warning, AnalyzerConstants.DisabledByDefault, Description, HelpLink, WellKnownDiagnosticTags.NotConfigurable); #pragma warning restore RS2000 // Add analyzer diagnostic IDs to analyzer release. +#pragma warning restore IDE0079 // Remove unnecessary suppression /// public override ImmutableArray SupportedDiagnostics { get; } = ImmutableArray.Create(Descriptor); /// +#pragma warning disable IDE0079 // Remove unnecessary suppression #pragma warning disable RS1025 // Configure generated code analysis #pragma warning disable RS1026 // Enable concurrent execution public override void Initialize(AnalysisContext context) #pragma warning restore RS1026 // Enable concurrent execution #pragma warning restore RS1025 // Configure generated code analysis +#pragma warning restore IDE0079 // Remove unnecessary suppression { // This diagnostic is not implemented (by design) in StyleCopAnalyzers. } diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/DocumentationRules/SA1644DocumentationHeadersMustNotContainBlankLines.cs b/StyleCop.Analyzers/StyleCop.Analyzers/DocumentationRules/SA1644DocumentationHeadersMustNotContainBlankLines.cs index fc868c4d0..aefd20582 100644 --- a/StyleCop.Analyzers/StyleCop.Analyzers/DocumentationRules/SA1644DocumentationHeadersMustNotContainBlankLines.cs +++ b/StyleCop.Analyzers/StyleCop.Analyzers/DocumentationRules/SA1644DocumentationHeadersMustNotContainBlankLines.cs @@ -68,20 +68,24 @@ internal class SA1644DocumentationHeadersMustNotContainBlankLines : DiagnosticAn private static readonly LocalizableString Description = new LocalizableResourceString(nameof(DocumentationResources.SA1644Description), DocumentationResources.ResourceManager, typeof(DocumentationResources)); private static readonly DiagnosticDescriptor Descriptor = +#pragma warning disable IDE0079 // Remove unnecessary suppression #pragma warning disable RS2000 // Add analyzer diagnostic IDs to analyzer release. new DiagnosticDescriptor(DiagnosticId, Title, MessageFormat, AnalyzerCategory.DocumentationRules, DiagnosticSeverity.Warning, AnalyzerConstants.DisabledByDefault, Description, HelpLink, WellKnownDiagnosticTags.NotConfigurable); #pragma warning restore RS2000 // Add analyzer diagnostic IDs to analyzer release. +#pragma warning restore IDE0079 // Remove unnecessary suppression /// public override ImmutableArray SupportedDiagnostics { get; } = ImmutableArray.Create(Descriptor); /// +#pragma warning disable IDE0079 // Remove unnecessary suppression #pragma warning disable RS1025 // Configure generated code analysis #pragma warning disable RS1026 // Enable concurrent execution public override void Initialize(AnalysisContext context) #pragma warning restore RS1026 // Enable concurrent execution #pragma warning restore RS1025 // Configure generated code analysis +#pragma warning restore IDE0079 // Remove unnecessary suppression { // This diagnostic is not implemented (by design) in StyleCopAnalyzers. } diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/DocumentationRules/SA1645IncludedDocumentationFileDoesNotExist.cs b/StyleCop.Analyzers/StyleCop.Analyzers/DocumentationRules/SA1645IncludedDocumentationFileDoesNotExist.cs index 442e2e8b1..2d3a2e165 100644 --- a/StyleCop.Analyzers/StyleCop.Analyzers/DocumentationRules/SA1645IncludedDocumentationFileDoesNotExist.cs +++ b/StyleCop.Analyzers/StyleCop.Analyzers/DocumentationRules/SA1645IncludedDocumentationFileDoesNotExist.cs @@ -45,20 +45,24 @@ internal class SA1645IncludedDocumentationFileDoesNotExist : DiagnosticAnalyzer private static readonly LocalizableString Description = new LocalizableResourceString(nameof(DocumentationResources.SA1645Description), DocumentationResources.ResourceManager, typeof(DocumentationResources)); private static readonly DiagnosticDescriptor Descriptor = +#pragma warning disable IDE0079 // Remove unnecessary suppression #pragma warning disable RS2000 // Add analyzer diagnostic IDs to analyzer release. new DiagnosticDescriptor(DiagnosticId, Title, MessageFormat, AnalyzerCategory.DocumentationRules, DiagnosticSeverity.Warning, AnalyzerConstants.DisabledByDefault, Description, HelpLink, WellKnownDiagnosticTags.NotConfigurable); #pragma warning restore RS2000 // Add analyzer diagnostic IDs to analyzer release. +#pragma warning restore IDE0079 // Remove unnecessary suppression /// public override ImmutableArray SupportedDiagnostics { get; } = ImmutableArray.Create(Descriptor); /// +#pragma warning disable IDE0079 // Remove unnecessary suppression #pragma warning disable RS1025 // Configure generated code analysis #pragma warning disable RS1026 // Enable concurrent execution public override void Initialize(AnalysisContext context) #pragma warning restore RS1026 // Enable concurrent execution #pragma warning restore RS1025 // Configure generated code analysis +#pragma warning restore IDE0079 // Remove unnecessary suppression { // This diagnostic is not implemented (by design) in StyleCopAnalyzers. } diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/DocumentationRules/SA1646IncludedDocumentationXPathDoesNotExist.cs b/StyleCop.Analyzers/StyleCop.Analyzers/DocumentationRules/SA1646IncludedDocumentationXPathDoesNotExist.cs index 7602a8f85..114206845 100644 --- a/StyleCop.Analyzers/StyleCop.Analyzers/DocumentationRules/SA1646IncludedDocumentationXPathDoesNotExist.cs +++ b/StyleCop.Analyzers/StyleCop.Analyzers/DocumentationRules/SA1646IncludedDocumentationXPathDoesNotExist.cs @@ -46,20 +46,24 @@ internal class SA1646IncludedDocumentationXPathDoesNotExist : DiagnosticAnalyzer private static readonly LocalizableString Description = new LocalizableResourceString(nameof(DocumentationResources.SA1646Description), DocumentationResources.ResourceManager, typeof(DocumentationResources)); private static readonly DiagnosticDescriptor Descriptor = +#pragma warning disable IDE0079 // Remove unnecessary suppression #pragma warning disable RS2000 // Add analyzer diagnostic IDs to analyzer release. new DiagnosticDescriptor(DiagnosticId, Title, MessageFormat, AnalyzerCategory.DocumentationRules, DiagnosticSeverity.Warning, AnalyzerConstants.DisabledByDefault, Description, HelpLink, WellKnownDiagnosticTags.NotConfigurable); #pragma warning restore RS2000 // Add analyzer diagnostic IDs to analyzer release. +#pragma warning restore IDE0079 // Remove unnecessary suppression /// public override ImmutableArray SupportedDiagnostics { get; } = ImmutableArray.Create(Descriptor); /// +#pragma warning disable IDE0079 // Remove unnecessary suppression #pragma warning disable RS1025 // Configure generated code analysis #pragma warning disable RS1026 // Enable concurrent execution public override void Initialize(AnalysisContext context) #pragma warning restore RS1026 // Enable concurrent execution #pragma warning restore RS1025 // Configure generated code analysis +#pragma warning restore IDE0079 // Remove unnecessary suppression { // This diagnostic is not implemented (by design) in StyleCopAnalyzers. } diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/DocumentationRules/SA1647IncludeNodeDoesNotContainValidFileAndPath.cs b/StyleCop.Analyzers/StyleCop.Analyzers/DocumentationRules/SA1647IncludeNodeDoesNotContainValidFileAndPath.cs index 8937d0de0..b7ce4479c 100644 --- a/StyleCop.Analyzers/StyleCop.Analyzers/DocumentationRules/SA1647IncludeNodeDoesNotContainValidFileAndPath.cs +++ b/StyleCop.Analyzers/StyleCop.Analyzers/DocumentationRules/SA1647IncludeNodeDoesNotContainValidFileAndPath.cs @@ -47,20 +47,24 @@ internal class SA1647IncludeNodeDoesNotContainValidFileAndPath : DiagnosticAnaly private static readonly LocalizableString Description = new LocalizableResourceString(nameof(DocumentationResources.SA1647Description), DocumentationResources.ResourceManager, typeof(DocumentationResources)); private static readonly DiagnosticDescriptor Descriptor = +#pragma warning disable IDE0079 // Remove unnecessary suppression #pragma warning disable RS2000 // Add analyzer diagnostic IDs to analyzer release. new DiagnosticDescriptor(DiagnosticId, Title, MessageFormat, AnalyzerCategory.DocumentationRules, DiagnosticSeverity.Warning, AnalyzerConstants.DisabledByDefault, Description, HelpLink, WellKnownDiagnosticTags.NotConfigurable); #pragma warning restore RS2000 // Add analyzer diagnostic IDs to analyzer release. +#pragma warning restore IDE0079 // Remove unnecessary suppression /// public override ImmutableArray SupportedDiagnostics { get; } = ImmutableArray.Create(Descriptor); /// +#pragma warning disable IDE0079 // Remove unnecessary suppression #pragma warning disable RS1025 // Configure generated code analysis #pragma warning disable RS1026 // Enable concurrent execution public override void Initialize(AnalysisContext context) #pragma warning restore RS1026 // Enable concurrent execution #pragma warning restore RS1025 // Configure generated code analysis +#pragma warning restore IDE0079 // Remove unnecessary suppression { // This diagnostic is not implemented (by design) in StyleCopAnalyzers. } diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/DocumentationRules/SA1650ElementDocumentationMustBeSpelledCorrectly.cs b/StyleCop.Analyzers/StyleCop.Analyzers/DocumentationRules/SA1650ElementDocumentationMustBeSpelledCorrectly.cs index 2f8286f06..9d1faf189 100644 --- a/StyleCop.Analyzers/StyleCop.Analyzers/DocumentationRules/SA1650ElementDocumentationMustBeSpelledCorrectly.cs +++ b/StyleCop.Analyzers/StyleCop.Analyzers/DocumentationRules/SA1650ElementDocumentationMustBeSpelledCorrectly.cs @@ -72,20 +72,24 @@ internal class SA1650ElementDocumentationMustBeSpelledCorrectly : DiagnosticAnal private static readonly LocalizableString Description = new LocalizableResourceString(nameof(DocumentationResources.SA1650Description), DocumentationResources.ResourceManager, typeof(DocumentationResources)); private static readonly DiagnosticDescriptor Descriptor = +#pragma warning disable IDE0079 // Remove unnecessary suppression #pragma warning disable RS2000 // Add analyzer diagnostic IDs to analyzer release. new DiagnosticDescriptor(DiagnosticId, Title, MessageFormat, AnalyzerCategory.DocumentationRules, DiagnosticSeverity.Warning, AnalyzerConstants.DisabledByDefault, Description, HelpLink, WellKnownDiagnosticTags.NotConfigurable); #pragma warning restore RS2000 // Add analyzer diagnostic IDs to analyzer release. +#pragma warning restore IDE0079 // Remove unnecessary suppression /// public override ImmutableArray SupportedDiagnostics { get; } = ImmutableArray.Create(Descriptor); /// +#pragma warning disable IDE0079 // Remove unnecessary suppression #pragma warning disable RS1025 // Configure generated code analysis #pragma warning disable RS1026 // Enable concurrent execution public override void Initialize(AnalysisContext context) #pragma warning restore RS1026 // Enable concurrent execution #pragma warning restore RS1025 // Configure generated code analysis +#pragma warning restore IDE0079 // Remove unnecessary suppression { // This diagnostic is not implemented (by design) in StyleCopAnalyzers. } diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/Helpers/DiagnosticOptionsHelper.cs b/StyleCop.Analyzers/StyleCop.Analyzers/Helpers/DiagnosticOptionsHelper.cs index 5c97de2bd..2fe638a11 100644 --- a/StyleCop.Analyzers/StyleCop.Analyzers/Helpers/DiagnosticOptionsHelper.cs +++ b/StyleCop.Analyzers/StyleCop.Analyzers/Helpers/DiagnosticOptionsHelper.cs @@ -4,9 +4,11 @@ #nullable disable // There are no start actions in this file. This warning should not be reported. +#pragma warning disable IDE0079 // Remove unnecessary suppression #pragma warning disable RS1012 // Start action has no registered actions. namespace StyleCop.Analyzers.Helpers +#pragma warning restore IDE0079 // Remove unnecessary suppression { using System; using Microsoft.CodeAnalysis; diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/Helpers/ObjectPools/ObjectPool`1.cs b/StyleCop.Analyzers/StyleCop.Analyzers/Helpers/ObjectPools/ObjectPool`1.cs index 54f373c0f..cdd10046e 100644 --- a/StyleCop.Analyzers/StyleCop.Analyzers/Helpers/ObjectPools/ObjectPool`1.cs +++ b/StyleCop.Analyzers/StyleCop.Analyzers/Helpers/ObjectPools/ObjectPool`1.cs @@ -43,9 +43,11 @@ internal class ObjectPool private T firstItem; internal ObjectPool(Func factory) +#pragma warning disable IDE0079 // Remove unnecessary suppression #pragma warning disable RS1035 // Do not use APIs banned for analyzers (false positive: https://github.com/dotnet/roslyn-analyzers/issues/6571) : this(factory, Environment.ProcessorCount * 2) #pragma warning restore RS1035 // Do not use APIs banned for analyzers +#pragma warning restore IDE0079 // Remove unnecessary suppression { } diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/LayoutRules/SA1503BracesMustNotBeOmitted.cs b/StyleCop.Analyzers/StyleCop.Analyzers/LayoutRules/SA1503BracesMustNotBeOmitted.cs index d74285bcc..61505d966 100644 --- a/StyleCop.Analyzers/StyleCop.Analyzers/LayoutRules/SA1503BracesMustNotBeOmitted.cs +++ b/StyleCop.Analyzers/StyleCop.Analyzers/LayoutRules/SA1503BracesMustNotBeOmitted.cs @@ -64,16 +64,13 @@ internal class SA1503BracesMustNotBeOmitted : DiagnosticAnalyzer /// public const string DiagnosticId = "SA1503"; + internal static readonly DiagnosticDescriptor Descriptor = + new DiagnosticDescriptor(DiagnosticId, Title, MessageFormat, AnalyzerCategory.LayoutRules, DiagnosticSeverity.Warning, AnalyzerConstants.EnabledByDefault, Description, HelpLink); + private const string HelpLink = "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1503.md"; private static readonly LocalizableString Title = new LocalizableResourceString(nameof(LayoutResources.SA1503Title), LayoutResources.ResourceManager, typeof(LayoutResources)); private static readonly LocalizableString MessageFormat = new LocalizableResourceString(nameof(LayoutResources.SA1503MessageFormat), LayoutResources.ResourceManager, typeof(LayoutResources)); private static readonly LocalizableString Description = new LocalizableResourceString(nameof(LayoutResources.SA1503Description), LayoutResources.ResourceManager, typeof(LayoutResources)); - -#pragma warning disable SA1202 // Elements should be ordered by access - internal static readonly DiagnosticDescriptor Descriptor = - new DiagnosticDescriptor(DiagnosticId, Title, MessageFormat, AnalyzerCategory.LayoutRules, DiagnosticSeverity.Warning, AnalyzerConstants.EnabledByDefault, Description, HelpLink); -#pragma warning restore SA1202 // Elements should be ordered by access - private static readonly Action IfStatementAction = HandleIfStatement; private static readonly Action UsingStatementAction = HandleUsingStatement; diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/LayoutRules/SA1507CodeMustNotContainMultipleBlankLinesInARow.cs b/StyleCop.Analyzers/StyleCop.Analyzers/LayoutRules/SA1507CodeMustNotContainMultipleBlankLinesInARow.cs index aed19a0bb..fef48e7eb 100644 --- a/StyleCop.Analyzers/StyleCop.Analyzers/LayoutRules/SA1507CodeMustNotContainMultipleBlankLinesInARow.cs +++ b/StyleCop.Analyzers/StyleCop.Analyzers/LayoutRules/SA1507CodeMustNotContainMultipleBlankLinesInARow.cs @@ -49,16 +49,13 @@ internal class SA1507CodeMustNotContainMultipleBlankLinesInARow : DiagnosticAnal /// public const string DiagnosticId = "SA1507"; + internal static readonly DiagnosticDescriptor Descriptor = + new DiagnosticDescriptor(DiagnosticId, Title, MessageFormat, AnalyzerCategory.LayoutRules, DiagnosticSeverity.Warning, AnalyzerConstants.EnabledByDefault, Description, HelpLink); + private const string HelpLink = "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1507.md"; private static readonly LocalizableString Title = new LocalizableResourceString(nameof(LayoutResources.SA1507Title), LayoutResources.ResourceManager, typeof(LayoutResources)); private static readonly LocalizableString MessageFormat = new LocalizableResourceString(nameof(LayoutResources.SA1507MessageFormat), LayoutResources.ResourceManager, typeof(LayoutResources)); private static readonly LocalizableString Description = new LocalizableResourceString(nameof(LayoutResources.SA1507Description), LayoutResources.ResourceManager, typeof(LayoutResources)); - -#pragma warning disable SA1202 // Elements should be ordered by access - internal static readonly DiagnosticDescriptor Descriptor = - new DiagnosticDescriptor(DiagnosticId, Title, MessageFormat, AnalyzerCategory.LayoutRules, DiagnosticSeverity.Warning, AnalyzerConstants.EnabledByDefault, Description, HelpLink); -#pragma warning restore SA1202 // Elements should be ordered by access - private static readonly Action SyntaxTreeAction = HandleSyntaxTree; /// diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/LayoutRules/SA1518UseLineEndingsCorrectlyAtEndOfFile.cs b/StyleCop.Analyzers/StyleCop.Analyzers/LayoutRules/SA1518UseLineEndingsCorrectlyAtEndOfFile.cs index 23c549d53..903d8b3fe 100644 --- a/StyleCop.Analyzers/StyleCop.Analyzers/LayoutRules/SA1518UseLineEndingsCorrectlyAtEndOfFile.cs +++ b/StyleCop.Analyzers/StyleCop.Analyzers/LayoutRules/SA1518UseLineEndingsCorrectlyAtEndOfFile.cs @@ -30,18 +30,7 @@ internal class SA1518UseLineEndingsCorrectlyAtEndOfFile : DiagnosticAnalyzer /// The ID for diagnostics produced by the analyzer. /// public const string DiagnosticId = "SA1518"; - private const string HelpLink = "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1518.md"; - - private static readonly LocalizableString Title = new LocalizableResourceString(nameof(LayoutResources.SA1518Title), LayoutResources.ResourceManager, typeof(LayoutResources)); - - private static readonly LocalizableString MessageFormatAllow = new LocalizableResourceString(nameof(LayoutResources.SA1518MessageFormatAllow), LayoutResources.ResourceManager, typeof(LayoutResources)); - private static readonly LocalizableString DescriptionAllow = new LocalizableResourceString(nameof(LayoutResources.SA1518DescriptionAllow), LayoutResources.ResourceManager, typeof(LayoutResources)); - private static readonly LocalizableString MessageFormatRequire = new LocalizableResourceString(nameof(LayoutResources.SA1518MessageFormatRequire), LayoutResources.ResourceManager, typeof(LayoutResources)); - private static readonly LocalizableString DescriptionRequire = new LocalizableResourceString(nameof(LayoutResources.SA1518DescriptionRequire), LayoutResources.ResourceManager, typeof(LayoutResources)); - private static readonly LocalizableString MessageFormatOmit = new LocalizableResourceString(nameof(LayoutResources.SA1518MessageFormatOmit), LayoutResources.ResourceManager, typeof(LayoutResources)); - private static readonly LocalizableString DescriptionOmit = new LocalizableResourceString(nameof(LayoutResources.SA1518DescriptionOmit), LayoutResources.ResourceManager, typeof(LayoutResources)); -#pragma warning disable SA1202 // Elements should be ordered by access internal static readonly DiagnosticDescriptor DescriptorAllow = new DiagnosticDescriptor(DiagnosticId, Title, MessageFormatAllow, AnalyzerCategory.LayoutRules, DiagnosticSeverity.Warning, AnalyzerConstants.EnabledByDefault, DescriptionAllow, HelpLink); @@ -50,8 +39,17 @@ internal class SA1518UseLineEndingsCorrectlyAtEndOfFile : DiagnosticAnalyzer internal static readonly DiagnosticDescriptor DescriptorOmit = new DiagnosticDescriptor(DiagnosticId, Title, MessageFormatOmit, AnalyzerCategory.LayoutRules, DiagnosticSeverity.Warning, AnalyzerConstants.EnabledByDefault, DescriptionOmit, HelpLink); -#pragma warning restore SA1202 // Elements should be ordered by access + private const string HelpLink = "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1518.md"; + + private static readonly LocalizableString Title = new LocalizableResourceString(nameof(LayoutResources.SA1518Title), LayoutResources.ResourceManager, typeof(LayoutResources)); + + private static readonly LocalizableString MessageFormatAllow = new LocalizableResourceString(nameof(LayoutResources.SA1518MessageFormatAllow), LayoutResources.ResourceManager, typeof(LayoutResources)); + private static readonly LocalizableString DescriptionAllow = new LocalizableResourceString(nameof(LayoutResources.SA1518DescriptionAllow), LayoutResources.ResourceManager, typeof(LayoutResources)); + private static readonly LocalizableString MessageFormatRequire = new LocalizableResourceString(nameof(LayoutResources.SA1518MessageFormatRequire), LayoutResources.ResourceManager, typeof(LayoutResources)); + private static readonly LocalizableString DescriptionRequire = new LocalizableResourceString(nameof(LayoutResources.SA1518DescriptionRequire), LayoutResources.ResourceManager, typeof(LayoutResources)); + private static readonly LocalizableString MessageFormatOmit = new LocalizableResourceString(nameof(LayoutResources.SA1518MessageFormatOmit), LayoutResources.ResourceManager, typeof(LayoutResources)); + private static readonly LocalizableString DescriptionOmit = new LocalizableResourceString(nameof(LayoutResources.SA1518DescriptionOmit), LayoutResources.ResourceManager, typeof(LayoutResources)); private static readonly Action SyntaxTreeAction = HandleSyntaxTree; /// diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/LayoutRules/SA1519BracesMustNotBeOmittedFromMultiLineChildStatement.cs b/StyleCop.Analyzers/StyleCop.Analyzers/LayoutRules/SA1519BracesMustNotBeOmittedFromMultiLineChildStatement.cs index b5bfc1443..f599ba5d5 100644 --- a/StyleCop.Analyzers/StyleCop.Analyzers/LayoutRules/SA1519BracesMustNotBeOmittedFromMultiLineChildStatement.cs +++ b/StyleCop.Analyzers/StyleCop.Analyzers/LayoutRules/SA1519BracesMustNotBeOmittedFromMultiLineChildStatement.cs @@ -39,16 +39,13 @@ internal class SA1519BracesMustNotBeOmittedFromMultiLineChildStatement : Diagnos /// public const string DiagnosticId = "SA1519"; + internal static readonly DiagnosticDescriptor Descriptor = + new DiagnosticDescriptor(DiagnosticId, Title, MessageFormat, AnalyzerCategory.LayoutRules, DiagnosticSeverity.Warning, AnalyzerConstants.EnabledByDefault, Description, HelpLink); + private const string HelpLink = "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1519.md"; private static readonly LocalizableString Title = new LocalizableResourceString(nameof(LayoutResources.SA1519Title), LayoutResources.ResourceManager, typeof(LayoutResources)); private static readonly LocalizableString MessageFormat = new LocalizableResourceString(nameof(LayoutResources.SA1519MessageFormat), LayoutResources.ResourceManager, typeof(LayoutResources)); private static readonly LocalizableString Description = new LocalizableResourceString(nameof(LayoutResources.SA1519Description), LayoutResources.ResourceManager, typeof(LayoutResources)); - -#pragma warning disable SA1202 // Elements should be ordered by access - internal static readonly DiagnosticDescriptor Descriptor = - new DiagnosticDescriptor(DiagnosticId, Title, MessageFormat, AnalyzerCategory.LayoutRules, DiagnosticSeverity.Warning, AnalyzerConstants.EnabledByDefault, Description, HelpLink); -#pragma warning restore SA1202 // Elements should be ordered by access - private static readonly Action IfStatementAction = HandleIfStatement; private static readonly Action DoStatementAction = HandleDoStatement; private static readonly Action WhileStatementAction = HandleWhileStatement; diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/LayoutRules/SA1520UseBracesConsistently.cs b/StyleCop.Analyzers/StyleCop.Analyzers/LayoutRules/SA1520UseBracesConsistently.cs index 21305e654..33ea040d2 100644 --- a/StyleCop.Analyzers/StyleCop.Analyzers/LayoutRules/SA1520UseBracesConsistently.cs +++ b/StyleCop.Analyzers/StyleCop.Analyzers/LayoutRules/SA1520UseBracesConsistently.cs @@ -45,16 +45,13 @@ internal class SA1520UseBracesConsistently : DiagnosticAnalyzer /// public const string DiagnosticId = "SA1520"; + internal static readonly DiagnosticDescriptor Descriptor = + new DiagnosticDescriptor(DiagnosticId, Title, MessageFormat, AnalyzerCategory.LayoutRules, DiagnosticSeverity.Warning, AnalyzerConstants.EnabledByDefault, Description, HelpLink); + private const string HelpLink = "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1520.md"; private static readonly LocalizableString Title = new LocalizableResourceString(nameof(LayoutResources.SA1520Title), LayoutResources.ResourceManager, typeof(LayoutResources)); private static readonly LocalizableString MessageFormat = new LocalizableResourceString(nameof(LayoutResources.SA1520MessageFormat), LayoutResources.ResourceManager, typeof(LayoutResources)); private static readonly LocalizableString Description = new LocalizableResourceString(nameof(LayoutResources.SA1520Description), LayoutResources.ResourceManager, typeof(LayoutResources)); - -#pragma warning disable SA1202 // Elements should be ordered by access - internal static readonly DiagnosticDescriptor Descriptor = - new DiagnosticDescriptor(DiagnosticId, Title, MessageFormat, AnalyzerCategory.LayoutRules, DiagnosticSeverity.Warning, AnalyzerConstants.EnabledByDefault, Description, HelpLink); -#pragma warning restore SA1202 // Elements should be ordered by access - private static readonly Action IfStatementAction = HandleIfStatement; /// diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/LightJson/JsonObject.cs b/StyleCop.Analyzers/StyleCop.Analyzers/LightJson/JsonObject.cs index 2b7551906..99af99e8a 100644 --- a/StyleCop.Analyzers/StyleCop.Analyzers/LightJson/JsonObject.cs +++ b/StyleCop.Analyzers/StyleCop.Analyzers/LightJson/JsonObject.cs @@ -227,10 +227,12 @@ public KeyValuePair[] Keys [DebuggerDisplay("{value.ToString(),nq}", Name = "{key}", Type = "JsonValue({Type})")] public class KeyValuePair { +#pragma warning disable IDE0079 // Remove unnecessary suppression #pragma warning disable IDE0052 // Remove unread private members [DebuggerBrowsable(DebuggerBrowsableState.Never)] private readonly string key; #pragma warning restore IDE0052 // Remove unread private members +#pragma warning restore IDE0079 // Remove unnecessary suppression [DebuggerBrowsable(DebuggerBrowsableState.Never)] private readonly JsonValue value; diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/Lightup/LanguageVersionEx.cs b/StyleCop.Analyzers/StyleCop.Analyzers/Lightup/LanguageVersionEx.cs index effed9196..e75ad2978 100644 --- a/StyleCop.Analyzers/StyleCop.Analyzers/Lightup/LanguageVersionEx.cs +++ b/StyleCop.Analyzers/StyleCop.Analyzers/Lightup/LanguageVersionEx.cs @@ -1,6 +1,7 @@ // Copyright (c) Tunnel Vision Laboratories, LLC. All Rights Reserved. // Licensed under the MIT License. See LICENSE in the project root for license information. +#pragma warning disable IDE0079 // Remove unnecessary suppression #pragma warning disable SA1310 // Field names should not contain underscore - Following roslyn naming conventions namespace StyleCop.Analyzers.Lightup @@ -27,3 +28,4 @@ internal static class LanguageVersionEx } #pragma warning restore SA1310 // Field names should not contain underscore +#pragma warning restore IDE0079 // Remove unnecessary suppression diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/MaintainabilityRules/SA1119StatementMustNotUseUnnecessaryParenthesis.cs b/StyleCop.Analyzers/StyleCop.Analyzers/MaintainabilityRules/SA1119StatementMustNotUseUnnecessaryParenthesis.cs index db8e25992..fe263a9c7 100644 --- a/StyleCop.Analyzers/StyleCop.Analyzers/MaintainabilityRules/SA1119StatementMustNotUseUnnecessaryParenthesis.cs +++ b/StyleCop.Analyzers/StyleCop.Analyzers/MaintainabilityRules/SA1119StatementMustNotUseUnnecessaryParenthesis.cs @@ -66,9 +66,11 @@ internal class SA1119StatementMustNotUseUnnecessaryParenthesis : DiagnosticAnaly new DiagnosticDescriptor(DiagnosticId, Title, MessageFormat, AnalyzerCategory.MaintainabilityRules, DiagnosticSeverity.Warning, AnalyzerConstants.EnabledByDefault, Description, HelpLink); private static readonly DiagnosticDescriptor ParenthesisDescriptor = +#pragma warning disable IDE0079 // Remove unnecessary suppression #pragma warning disable RS2000 // Add analyzer diagnostic IDs to analyzer release. new DiagnosticDescriptor(ParenthesesDiagnosticId, Title, MessageFormat, AnalyzerCategory.MaintainabilityRules, DiagnosticSeverity.Hidden, AnalyzerConstants.EnabledByDefault, Description, HelpLink, customTags: new[] { WellKnownDiagnosticTags.Unnecessary, WellKnownDiagnosticTags.NotConfigurable }); #pragma warning restore RS2000 // Add analyzer diagnostic IDs to analyzer release. +#pragma warning restore IDE0079 // Remove unnecessary suppression private static readonly Action CompilationStartAction = HandleCompilationStart; private static readonly Action ParenthesizedExpressionAction = HandleParenthesizedExpression; diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/MaintainabilityRules/SA1409RemoveUnnecessaryCode.cs b/StyleCop.Analyzers/StyleCop.Analyzers/MaintainabilityRules/SA1409RemoveUnnecessaryCode.cs index d13db10c9..ffee0fdc4 100644 --- a/StyleCop.Analyzers/StyleCop.Analyzers/MaintainabilityRules/SA1409RemoveUnnecessaryCode.cs +++ b/StyleCop.Analyzers/StyleCop.Analyzers/MaintainabilityRules/SA1409RemoveUnnecessaryCode.cs @@ -66,20 +66,24 @@ internal class SA1409RemoveUnnecessaryCode : DiagnosticAnalyzer private static readonly LocalizableString Description = new LocalizableResourceString(nameof(MaintainabilityResources.SA1409Description), MaintainabilityResources.ResourceManager, typeof(MaintainabilityResources)); private static readonly DiagnosticDescriptor Descriptor = +#pragma warning disable IDE0079 // Remove unnecessary suppression #pragma warning disable RS2000 // Add analyzer diagnostic IDs to analyzer release. new DiagnosticDescriptor(DiagnosticId, Title, MessageFormat, AnalyzerCategory.MaintainabilityRules, DiagnosticSeverity.Warning, AnalyzerConstants.DisabledByDefault, Description, HelpLink, WellKnownDiagnosticTags.NotConfigurable); #pragma warning restore RS2000 // Add analyzer diagnostic IDs to analyzer release. +#pragma warning restore IDE0079 // Remove unnecessary suppression /// public override ImmutableArray SupportedDiagnostics { get; } = ImmutableArray.Create(Descriptor); /// +#pragma warning disable IDE0079 // Remove unnecessary suppression #pragma warning disable RS1025 // Configure generated code analysis #pragma warning disable RS1026 // Enable concurrent execution public override void Initialize(AnalysisContext context) #pragma warning restore RS1026 // Enable concurrent execution #pragma warning restore RS1025 // Configure generated code analysis +#pragma warning restore IDE0079 // Remove unnecessary suppression { // This diagnostic is not implemented (by design) in StyleCopAnalyzers. } diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/NamingRules/SA1301ElementMustBeginWithLowerCaseLetter.cs b/StyleCop.Analyzers/StyleCop.Analyzers/NamingRules/SA1301ElementMustBeginWithLowerCaseLetter.cs index 01c295617..498f5d1c7 100644 --- a/StyleCop.Analyzers/StyleCop.Analyzers/NamingRules/SA1301ElementMustBeginWithLowerCaseLetter.cs +++ b/StyleCop.Analyzers/StyleCop.Analyzers/NamingRules/SA1301ElementMustBeginWithLowerCaseLetter.cs @@ -27,9 +27,11 @@ internal class SA1301ElementMustBeginWithLowerCaseLetter : DiagnosticAnalyzer private static readonly LocalizableString Description = new LocalizableResourceString(nameof(NamingResources.SA1301Description), NamingResources.ResourceManager, typeof(NamingResources)); private static readonly DiagnosticDescriptor Descriptor = +#pragma warning disable IDE0079 // Remove unnecessary suppression #pragma warning disable RS2000 // Add analyzer diagnostic IDs to analyzer release. new DiagnosticDescriptor(DiagnosticId, Title, MessageFormat, AnalyzerCategory.NamingRules, DiagnosticSeverity.Warning, AnalyzerConstants.DisabledByDefault, Description, HelpLink, WellKnownDiagnosticTags.NotConfigurable); #pragma warning restore RS2000 // Add analyzer diagnostic IDs to analyzer release. +#pragma warning restore IDE0079 // Remove unnecessary suppression /// public override ImmutableArray SupportedDiagnostics { get; } = diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/NamingRules/SA1307AccessibleFieldsMustBeginWithUpperCaseLetter.cs b/StyleCop.Analyzers/StyleCop.Analyzers/NamingRules/SA1307AccessibleFieldsMustBeginWithUpperCaseLetter.cs index 2794aa757..41b2ad378 100644 --- a/StyleCop.Analyzers/StyleCop.Analyzers/NamingRules/SA1307AccessibleFieldsMustBeginWithUpperCaseLetter.cs +++ b/StyleCop.Analyzers/StyleCop.Analyzers/NamingRules/SA1307AccessibleFieldsMustBeginWithUpperCaseLetter.cs @@ -34,16 +34,15 @@ internal class SA1307AccessibleFieldsMustBeginWithUpperCaseLetter : DiagnosticAn /// analyzer. /// public const string DiagnosticId = "SA1307"; + + internal static readonly DiagnosticDescriptor Descriptor = + new DiagnosticDescriptor(DiagnosticId, Title, MessageFormat, AnalyzerCategory.NamingRules, DiagnosticSeverity.Warning, AnalyzerConstants.EnabledByDefault, Description, HelpLink); + private const string HelpLink = "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1307.md"; private static readonly LocalizableString Title = new LocalizableResourceString(nameof(NamingResources.SA1307Title), NamingResources.ResourceManager, typeof(NamingResources)); private static readonly LocalizableString MessageFormat = new LocalizableResourceString(nameof(NamingResources.SA1307MessageFormat), NamingResources.ResourceManager, typeof(NamingResources)); private static readonly LocalizableString Description = new LocalizableResourceString(nameof(NamingResources.SA1307Description), NamingResources.ResourceManager, typeof(NamingResources)); -#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 FieldDeclarationAction = HandleFieldDeclaration; /// diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/OrderingRules/SA1200UsingDirectivesMustBePlacedCorrectly.cs b/StyleCop.Analyzers/StyleCop.Analyzers/OrderingRules/SA1200UsingDirectivesMustBePlacedCorrectly.cs index 062240cb4..7b6eb9a66 100644 --- a/StyleCop.Analyzers/StyleCop.Analyzers/OrderingRules/SA1200UsingDirectivesMustBePlacedCorrectly.cs +++ b/StyleCop.Analyzers/StyleCop.Analyzers/OrderingRules/SA1200UsingDirectivesMustBePlacedCorrectly.cs @@ -161,6 +161,12 @@ internal class SA1200UsingDirectivesMustBePlacedCorrectly : DiagnosticAnalyzer /// public const string DiagnosticId = "SA1200"; + internal static readonly DiagnosticDescriptor DescriptorInside = + new DiagnosticDescriptor(DiagnosticId, Title, MessageFormatInside, AnalyzerCategory.OrderingRules, DiagnosticSeverity.Warning, AnalyzerConstants.EnabledByDefault, DescriptionInside, HelpLink); + + internal static readonly DiagnosticDescriptor DescriptorOutside = + new DiagnosticDescriptor(DiagnosticId, Title, MessageFormatOutside, AnalyzerCategory.OrderingRules, DiagnosticSeverity.Warning, AnalyzerConstants.EnabledByDefault, DescriptionOutside, HelpLink); + private const string HelpLink = "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1200.md"; private static readonly LocalizableString Title = new LocalizableResourceString(nameof(OrderingResources.SA1200Title), OrderingResources.ResourceManager, typeof(OrderingResources)); @@ -170,15 +176,6 @@ internal class SA1200UsingDirectivesMustBePlacedCorrectly : DiagnosticAnalyzer private static readonly LocalizableString MessageFormatOutside = new LocalizableResourceString(nameof(OrderingResources.SA1200MessageFormatOutside), OrderingResources.ResourceManager, typeof(OrderingResources)); private static readonly LocalizableString DescriptionOutside = new LocalizableResourceString(nameof(OrderingResources.SA1200DescriptionOutside), OrderingResources.ResourceManager, typeof(OrderingResources)); - -#pragma warning disable SA1202 // Elements should be ordered by access - internal static readonly DiagnosticDescriptor DescriptorInside = - new DiagnosticDescriptor(DiagnosticId, Title, MessageFormatInside, AnalyzerCategory.OrderingRules, DiagnosticSeverity.Warning, AnalyzerConstants.EnabledByDefault, DescriptionInside, HelpLink); - - internal static readonly DiagnosticDescriptor DescriptorOutside = - new DiagnosticDescriptor(DiagnosticId, Title, MessageFormatOutside, AnalyzerCategory.OrderingRules, DiagnosticSeverity.Warning, AnalyzerConstants.EnabledByDefault, DescriptionOutside, HelpLink); -#pragma warning restore SA1202 // Elements should be ordered by access - private static readonly Action CompilationUnitAction = HandleCompilationUnit; private static readonly Action BaseNamespaceDeclarationAction = HandleBaseNamespaceDeclaration; @@ -278,9 +275,11 @@ private static void HandleBaseNamespaceDeclaration(SyntaxNodeAnalysisContext con foreach (UsingDirectiveSyntax directive in syntax.Usings) { // Using directive should appear outside a namespace declaration +#pragma warning disable IDE0079 // Remove unnecessary suppression #pragma warning disable RS1005 // ReportDiagnostic invoked with an unsupported DiagnosticDescriptor (https://github.com/dotnet/roslyn-analyzers/issues/4103) context.ReportDiagnostic(Diagnostic.Create(DescriptorOutside, directive.GetLocation())); #pragma warning restore RS1005 // ReportDiagnostic invoked with an unsupported DiagnosticDescriptor +#pragma warning restore IDE0079 // Remove unnecessary suppression } } } diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/ReadabilityRules/SA1109BlockStatementsMustNotContainEmbeddedRegions.cs b/StyleCop.Analyzers/StyleCop.Analyzers/ReadabilityRules/SA1109BlockStatementsMustNotContainEmbeddedRegions.cs index e8b20427b..fefc84d3d 100644 --- a/StyleCop.Analyzers/StyleCop.Analyzers/ReadabilityRules/SA1109BlockStatementsMustNotContainEmbeddedRegions.cs +++ b/StyleCop.Analyzers/StyleCop.Analyzers/ReadabilityRules/SA1109BlockStatementsMustNotContainEmbeddedRegions.cs @@ -42,20 +42,24 @@ internal class SA1109BlockStatementsMustNotContainEmbeddedRegions : DiagnosticAn private static readonly LocalizableString Description = new LocalizableResourceString(nameof(ReadabilityResources.SA1109Description), ReadabilityResources.ResourceManager, typeof(ReadabilityResources)); private static readonly DiagnosticDescriptor Descriptor = +#pragma warning disable IDE0079 // Remove unnecessary suppression #pragma warning disable RS2000 // Add analyzer diagnostic IDs to analyzer release. new DiagnosticDescriptor(DiagnosticId, Title, MessageFormat, AnalyzerCategory.ReadabilityRules, DiagnosticSeverity.Warning, AnalyzerConstants.DisabledByDefault, Description, HelpLink, WellKnownDiagnosticTags.NotConfigurable); #pragma warning restore RS2000 // Add analyzer diagnostic IDs to analyzer release. +#pragma warning restore IDE0079 // Remove unnecessary suppression /// public override ImmutableArray SupportedDiagnostics { get; } = ImmutableArray.Create(Descriptor); /// +#pragma warning disable IDE0079 // Remove unnecessary suppression #pragma warning disable RS1025 // Configure generated code analysis #pragma warning disable RS1026 // Enable concurrent execution public override void Initialize(AnalysisContext context) #pragma warning restore RS1026 // Enable concurrent execution #pragma warning restore RS1025 // Configure generated code analysis +#pragma warning restore IDE0079 // Remove unnecessary suppression { // This diagnostic is not implemented (by design) in StyleCopAnalyzers. } diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/ReadabilityRules/SA1126PrefixCallsCorrectly.cs b/StyleCop.Analyzers/StyleCop.Analyzers/ReadabilityRules/SA1126PrefixCallsCorrectly.cs index 3c3717477..bce90b716 100644 --- a/StyleCop.Analyzers/StyleCop.Analyzers/ReadabilityRules/SA1126PrefixCallsCorrectly.cs +++ b/StyleCop.Analyzers/StyleCop.Analyzers/ReadabilityRules/SA1126PrefixCallsCorrectly.cs @@ -36,20 +36,24 @@ internal class SA1126PrefixCallsCorrectly : DiagnosticAnalyzer private static readonly LocalizableString Description = new LocalizableResourceString(nameof(ReadabilityResources.SA1126Description), ReadabilityResources.ResourceManager, typeof(ReadabilityResources)); private static readonly DiagnosticDescriptor Descriptor = +#pragma warning disable IDE0079 // Remove unnecessary suppression #pragma warning disable RS2000 // Add analyzer diagnostic IDs to analyzer release. new DiagnosticDescriptor(DiagnosticId, Title, MessageFormat, AnalyzerCategory.ReadabilityRules, DiagnosticSeverity.Warning, AnalyzerConstants.DisabledByDefault, Description, HelpLink, WellKnownDiagnosticTags.NotConfigurable); #pragma warning restore RS2000 // Add analyzer diagnostic IDs to analyzer release. +#pragma warning restore IDE0079 // Remove unnecessary suppression /// public override ImmutableArray SupportedDiagnostics { get; } = ImmutableArray.Create(Descriptor); /// +#pragma warning disable IDE0079 // Remove unnecessary suppression #pragma warning disable RS1025 // Configure generated code analysis #pragma warning disable RS1026 // Enable concurrent execution public override void Initialize(AnalysisContext context) #pragma warning restore RS1026 // Enable concurrent execution #pragma warning restore RS1025 // Configure generated code analysis +#pragma warning restore IDE0079 // Remove unnecessary suppression { // This diagnostic is not implemented (by design) in StyleCopAnalyzers. } diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/Settings/SettingsHelper.cs b/StyleCop.Analyzers/StyleCop.Analyzers/Settings/SettingsHelper.cs index e306d6607..c5f638164 100644 --- a/StyleCop.Analyzers/StyleCop.Analyzers/Settings/SettingsHelper.cs +++ b/StyleCop.Analyzers/StyleCop.Analyzers/Settings/SettingsHelper.cs @@ -42,7 +42,9 @@ internal static class SettingsHelper /// The cancellation token that the operation will observe. /// A instance which contains information about the the StyleCop settings file for the given context. /// Null if no settings file was found. +#pragma warning disable IDE0079 // Remove unnecessary suppression [SuppressMessage("MicrosoftCodeAnalysisPerformance", "RS1012:Start action has no registered actions", Justification = "This is not a start action")] +#pragma warning restore IDE0079 // Remove unnecessary suppression internal static SettingsFile GetStyleCopSettingsFile(this CompilationStartAnalysisContext context, CancellationToken cancellationToken) { return GetSettingsFile(context.Options, GetJsonValue, cancellationToken); @@ -62,7 +64,9 @@ Lazy GetJsonValue(SourceText settingsText) } } +#pragma warning disable IDE0079 // Remove unnecessary suppression [SuppressMessage("MicrosoftCodeAnalysisPerformance", "RS1012:Start action has no registered actions", Justification = "This is not a start action")] +#pragma warning restore IDE0079 // Remove unnecessary suppression internal static StrongBox GetOrCreateSettingsStorage(this CompilationStartAnalysisContext context, SyntaxTree tree) { if (!context.TryGetValue(tree, SettingsStorageValueProvider, out var storage)) diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/SpacingRules/SA1009ClosingParenthesisMustBeSpacedCorrectly.cs b/StyleCop.Analyzers/StyleCop.Analyzers/SpacingRules/SA1009ClosingParenthesisMustBeSpacedCorrectly.cs index c33850329..312d13874 100644 --- a/StyleCop.Analyzers/StyleCop.Analyzers/SpacingRules/SA1009ClosingParenthesisMustBeSpacedCorrectly.cs +++ b/StyleCop.Analyzers/StyleCop.Analyzers/SpacingRules/SA1009ClosingParenthesisMustBeSpacedCorrectly.cs @@ -36,17 +36,7 @@ internal class SA1009ClosingParenthesisMustBeSpacedCorrectly : DiagnosticAnalyze /// The ID for diagnostics produced by the analyzer. /// public const string DiagnosticId = "SA1009"; - private const string HelpLink = "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1009.md"; - private static readonly LocalizableString Title = new LocalizableResourceString(nameof(SpacingResources.SA1009Title), SpacingResources.ResourceManager, typeof(SpacingResources)); - private static readonly LocalizableString Description = new LocalizableResourceString(nameof(SpacingResources.SA1009Description), SpacingResources.ResourceManager, typeof(SpacingResources)); - - private static readonly LocalizableString MessageNotPreceded = new LocalizableResourceString(nameof(SpacingResources.SA1009MessageNotPreceded), SpacingResources.ResourceManager, typeof(SpacingResources)); - private static readonly LocalizableString MessageNotFollowed = new LocalizableResourceString(nameof(SpacingResources.SA1009MessageNotFollowed), SpacingResources.ResourceManager, typeof(SpacingResources)); - private static readonly LocalizableString MessageFollowed = new LocalizableResourceString(nameof(SpacingResources.SA1009MessageFollowed), SpacingResources.ResourceManager, typeof(SpacingResources)); - private static readonly Action SyntaxTreeAction = HandleSyntaxTree; - -#pragma warning disable SA1202 // Elements should be ordered by access internal static readonly DiagnosticDescriptor DescriptorNotPreceded = new DiagnosticDescriptor(DiagnosticId, Title, MessageNotPreceded, AnalyzerCategory.SpacingRules, DiagnosticSeverity.Warning, AnalyzerConstants.EnabledByDefault, Description, HelpLink); @@ -55,7 +45,16 @@ internal class SA1009ClosingParenthesisMustBeSpacedCorrectly : DiagnosticAnalyze internal static readonly DiagnosticDescriptor DescriptorFollowed = new DiagnosticDescriptor(DiagnosticId, Title, MessageFollowed, AnalyzerCategory.SpacingRules, DiagnosticSeverity.Warning, AnalyzerConstants.EnabledByDefault, Description, HelpLink); -#pragma warning restore SA1202 // Elements should be ordered by access + + private const string HelpLink = "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1009.md"; + private static readonly LocalizableString Title = new LocalizableResourceString(nameof(SpacingResources.SA1009Title), SpacingResources.ResourceManager, typeof(SpacingResources)); + private static readonly LocalizableString Description = new LocalizableResourceString(nameof(SpacingResources.SA1009Description), SpacingResources.ResourceManager, typeof(SpacingResources)); + + private static readonly LocalizableString MessageNotPreceded = new LocalizableResourceString(nameof(SpacingResources.SA1009MessageNotPreceded), SpacingResources.ResourceManager, typeof(SpacingResources)); + private static readonly LocalizableString MessageNotFollowed = new LocalizableResourceString(nameof(SpacingResources.SA1009MessageNotFollowed), SpacingResources.ResourceManager, typeof(SpacingResources)); + private static readonly LocalizableString MessageFollowed = new LocalizableResourceString(nameof(SpacingResources.SA1009MessageFollowed), SpacingResources.ResourceManager, typeof(SpacingResources)); + + private static readonly Action SyntaxTreeAction = HandleSyntaxTree; /// public override ImmutableArray SupportedDiagnostics { get; } = @@ -250,17 +249,21 @@ private static void HandleCloseParenToken(SyntaxTreeAnalysisContext context, Syn { // Closing parenthesis should{} be {followed} by a space. var properties = TokenSpacingProperties.InsertFollowing; +#pragma warning disable IDE0079 // Remove unnecessary suppression #pragma warning disable RS1005 // ReportDiagnostic invoked with an unsupported DiagnosticDescriptor (https://github.com/dotnet/roslyn-analyzers/issues/4103) context.ReportDiagnostic(Diagnostic.Create(DescriptorFollowed, token.GetLocation(), properties)); #pragma warning restore RS1005 // ReportDiagnostic invoked with an unsupported DiagnosticDescriptor +#pragma warning restore IDE0079 // Remove unnecessary suppression } else if (precedesStickyCharacter && followedBySpace && (!lastInLine || !allowEndOfLine)) { // Closing parenthesis should{ not} be {followed} by a space. var properties = TokenSpacingProperties.RemoveFollowing; +#pragma warning disable IDE0079 // Remove unnecessary suppression #pragma warning disable RS1005 // ReportDiagnostic invoked with an unsupported DiagnosticDescriptor (https://github.com/dotnet/roslyn-analyzers/issues/4103) context.ReportDiagnostic(Diagnostic.Create(DescriptorNotFollowed, token.GetLocation(), properties)); #pragma warning restore RS1005 // ReportDiagnostic invoked with an unsupported DiagnosticDescriptor +#pragma warning restore IDE0079 // Remove unnecessary suppression } } } diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/SpacingRules/SA1010OpeningSquareBracketsMustBeSpacedCorrectly.cs b/StyleCop.Analyzers/StyleCop.Analyzers/SpacingRules/SA1010OpeningSquareBracketsMustBeSpacedCorrectly.cs index 575e4f159..6f39ba603 100644 --- a/StyleCop.Analyzers/StyleCop.Analyzers/SpacingRules/SA1010OpeningSquareBracketsMustBeSpacedCorrectly.cs +++ b/StyleCop.Analyzers/StyleCop.Analyzers/SpacingRules/SA1010OpeningSquareBracketsMustBeSpacedCorrectly.cs @@ -32,6 +32,13 @@ internal class SA1010OpeningSquareBracketsMustBeSpacedCorrectly : DiagnosticAnal /// analyzer. /// public const string DiagnosticId = "SA1010"; + + internal static readonly DiagnosticDescriptor DescriptorNotPreceded = + new DiagnosticDescriptor(DiagnosticId, Title, MessageNotPreceded, AnalyzerCategory.SpacingRules, DiagnosticSeverity.Warning, AnalyzerConstants.EnabledByDefault, Description, HelpLink); + + internal static readonly DiagnosticDescriptor DescriptorNotFollowed = + new DiagnosticDescriptor(DiagnosticId, Title, MessageNotFollowed, AnalyzerCategory.SpacingRules, DiagnosticSeverity.Warning, AnalyzerConstants.EnabledByDefault, Description, HelpLink); + private const string HelpLink = "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1010.md"; private static readonly LocalizableString Title = new LocalizableResourceString(nameof(SpacingResources.SA1010Title), SpacingResources.ResourceManager, typeof(SpacingResources)); private static readonly LocalizableString Description = new LocalizableResourceString(nameof(SpacingResources.SA1010Description), SpacingResources.ResourceManager, typeof(SpacingResources)); @@ -41,14 +48,6 @@ internal class SA1010OpeningSquareBracketsMustBeSpacedCorrectly : DiagnosticAnal private static readonly Action SyntaxTreeAction = HandleSyntaxTree; -#pragma warning disable SA1202 // Elements should be ordered by access - internal static readonly DiagnosticDescriptor DescriptorNotPreceded = - new DiagnosticDescriptor(DiagnosticId, Title, MessageNotPreceded, AnalyzerCategory.SpacingRules, DiagnosticSeverity.Warning, AnalyzerConstants.EnabledByDefault, Description, HelpLink); - - internal static readonly DiagnosticDescriptor DescriptorNotFollowed = - new DiagnosticDescriptor(DiagnosticId, Title, MessageNotFollowed, AnalyzerCategory.SpacingRules, DiagnosticSeverity.Warning, AnalyzerConstants.EnabledByDefault, Description, HelpLink); -#pragma warning restore SA1202 // Elements should be ordered by access - /// public override ImmutableArray SupportedDiagnostics { get; } = ImmutableArray.Create(DescriptorNotPreceded); @@ -112,9 +111,11 @@ private static void HandleOpenBracketToken(SyntaxTreeAnalysisContext context, Sy if (!lastInLine && followedBySpace) { // Opening square bracket should {not be followed} by a space. +#pragma warning disable IDE0079 // Remove unnecessary suppression #pragma warning disable RS1005 // ReportDiagnostic invoked with an unsupported DiagnosticDescriptor (https://github.com/dotnet/roslyn-analyzers/issues/4103) context.ReportDiagnostic(Diagnostic.Create(DescriptorNotFollowed, token.GetLocation(), TokenSpacingProperties.RemoveFollowing)); #pragma warning restore RS1005 // ReportDiagnostic invoked with an unsupported DiagnosticDescriptor +#pragma warning restore IDE0079 // Remove unnecessary suppression } } diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/SpacingRules/SA1015ClosingGenericBracketsMustBeSpacedCorrectly.cs b/StyleCop.Analyzers/StyleCop.Analyzers/SpacingRules/SA1015ClosingGenericBracketsMustBeSpacedCorrectly.cs index c634931ab..e38cfe325 100644 --- a/StyleCop.Analyzers/StyleCop.Analyzers/SpacingRules/SA1015ClosingGenericBracketsMustBeSpacedCorrectly.cs +++ b/StyleCop.Analyzers/StyleCop.Analyzers/SpacingRules/SA1015ClosingGenericBracketsMustBeSpacedCorrectly.cs @@ -30,17 +30,7 @@ internal class SA1015ClosingGenericBracketsMustBeSpacedCorrectly : DiagnosticAna /// analyzer. /// public const string DiagnosticId = "SA1015"; - private const string HelpLink = "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1015.md"; - private static readonly LocalizableString Title = new LocalizableResourceString(nameof(SpacingResources.SA1015Title), SpacingResources.ResourceManager, typeof(SpacingResources)); - private static readonly LocalizableString Description = new LocalizableResourceString(nameof(SpacingResources.SA1015Description), SpacingResources.ResourceManager, typeof(SpacingResources)); - - private static readonly LocalizableString MessageNotPreceded = new LocalizableResourceString(nameof(SpacingResources.SA1015MessageNotPreceded), SpacingResources.ResourceManager, typeof(SpacingResources)); - private static readonly LocalizableString MessageNotFollowed = new LocalizableResourceString(nameof(SpacingResources.SA1015MessageNotFollowed), SpacingResources.ResourceManager, typeof(SpacingResources)); - private static readonly LocalizableString MessageFollowed = new LocalizableResourceString(nameof(SpacingResources.SA1015MessageFollowed), SpacingResources.ResourceManager, typeof(SpacingResources)); - private static readonly Action SyntaxTreeAction = HandleSyntaxTree; - -#pragma warning disable SA1202 // Elements should be ordered by access internal static readonly DiagnosticDescriptor DescriptorNotPreceded = new DiagnosticDescriptor(DiagnosticId, Title, MessageNotPreceded, AnalyzerCategory.SpacingRules, DiagnosticSeverity.Warning, AnalyzerConstants.EnabledByDefault, Description, HelpLink); @@ -49,7 +39,16 @@ internal class SA1015ClosingGenericBracketsMustBeSpacedCorrectly : DiagnosticAna internal static readonly DiagnosticDescriptor DescriptorFollowed = new DiagnosticDescriptor(DiagnosticId, Title, MessageFollowed, AnalyzerCategory.SpacingRules, DiagnosticSeverity.Warning, AnalyzerConstants.EnabledByDefault, Description, HelpLink); -#pragma warning restore SA1202 // Elements should be ordered by access + + private const string HelpLink = "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1015.md"; + private static readonly LocalizableString Title = new LocalizableResourceString(nameof(SpacingResources.SA1015Title), SpacingResources.ResourceManager, typeof(SpacingResources)); + private static readonly LocalizableString Description = new LocalizableResourceString(nameof(SpacingResources.SA1015Description), SpacingResources.ResourceManager, typeof(SpacingResources)); + + private static readonly LocalizableString MessageNotPreceded = new LocalizableResourceString(nameof(SpacingResources.SA1015MessageNotPreceded), SpacingResources.ResourceManager, typeof(SpacingResources)); + private static readonly LocalizableString MessageNotFollowed = new LocalizableResourceString(nameof(SpacingResources.SA1015MessageNotFollowed), SpacingResources.ResourceManager, typeof(SpacingResources)); + private static readonly LocalizableString MessageFollowed = new LocalizableResourceString(nameof(SpacingResources.SA1015MessageFollowed), SpacingResources.ResourceManager, typeof(SpacingResources)); + + private static readonly Action SyntaxTreeAction = HandleSyntaxTree; /// public override ImmutableArray SupportedDiagnostics { get; } = @@ -177,17 +176,21 @@ private static void HandleGreaterThanToken(SyntaxTreeAnalysisContext context, Sy { // Closing generic bracket should{} be {followed} by a space. var properties = TokenSpacingProperties.InsertFollowing; +#pragma warning disable IDE0079 // Remove unnecessary suppression #pragma warning disable RS1005 // ReportDiagnostic invoked with an unsupported DiagnosticDescriptor (https://github.com/dotnet/roslyn-analyzers/issues/4103) context.ReportDiagnostic(Diagnostic.Create(DescriptorFollowed, token.GetLocation(), properties)); #pragma warning restore RS1005 // ReportDiagnostic invoked with an unsupported DiagnosticDescriptor +#pragma warning restore IDE0079 // Remove unnecessary suppression } else if (!allowTrailingSpace && followedBySpace) { // Closing generic bracket should{ not} be {followed} by a space. var properties = TokenSpacingProperties.RemoveFollowing; +#pragma warning disable IDE0079 // Remove unnecessary suppression #pragma warning disable RS1005 // ReportDiagnostic invoked with an unsupported DiagnosticDescriptor (https://github.com/dotnet/roslyn-analyzers/issues/4103) context.ReportDiagnostic(Diagnostic.Create(DescriptorNotFollowed, token.GetLocation(), properties)); #pragma warning restore RS1005 // ReportDiagnostic invoked with an unsupported DiagnosticDescriptor +#pragma warning restore IDE0079 // Remove unnecessary suppression } } } diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/SpacingRules/SA1019MemberAccessSymbolsMustBeSpacedCorrectly.cs b/StyleCop.Analyzers/StyleCop.Analyzers/SpacingRules/SA1019MemberAccessSymbolsMustBeSpacedCorrectly.cs index b6c877dfe..727d4004d 100644 --- a/StyleCop.Analyzers/StyleCop.Analyzers/SpacingRules/SA1019MemberAccessSymbolsMustBeSpacedCorrectly.cs +++ b/StyleCop.Analyzers/StyleCop.Analyzers/SpacingRules/SA1019MemberAccessSymbolsMustBeSpacedCorrectly.cs @@ -27,6 +27,13 @@ internal class SA1019MemberAccessSymbolsMustBeSpacedCorrectly : DiagnosticAnalyz /// analyzer. /// public const string DiagnosticId = "SA1019"; + + internal static readonly DiagnosticDescriptor DescriptorNotPreceded = + new DiagnosticDescriptor(DiagnosticId, Title, MessageNotPreceded, AnalyzerCategory.SpacingRules, DiagnosticSeverity.Warning, AnalyzerConstants.EnabledByDefault, Description, HelpLink); + + internal static readonly DiagnosticDescriptor DescriptorNotFollowed = + new DiagnosticDescriptor(DiagnosticId, Title, MessageNotFollowed, AnalyzerCategory.SpacingRules, DiagnosticSeverity.Warning, AnalyzerConstants.EnabledByDefault, Description, HelpLink); + private const string HelpLink = "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1019.md"; private static readonly LocalizableString Title = new LocalizableResourceString(nameof(SpacingResources.SA1019Title), SpacingResources.ResourceManager, typeof(SpacingResources)); private static readonly LocalizableString Description = new LocalizableResourceString(nameof(SpacingResources.SA1019Description), SpacingResources.ResourceManager, typeof(SpacingResources)); @@ -36,14 +43,6 @@ internal class SA1019MemberAccessSymbolsMustBeSpacedCorrectly : DiagnosticAnalyz private static readonly Action SyntaxTreeAction = HandleSyntaxTree; -#pragma warning disable SA1202 // Elements should be ordered by access - internal static readonly DiagnosticDescriptor DescriptorNotPreceded = - new DiagnosticDescriptor(DiagnosticId, Title, MessageNotPreceded, AnalyzerCategory.SpacingRules, DiagnosticSeverity.Warning, AnalyzerConstants.EnabledByDefault, Description, HelpLink); - - internal static readonly DiagnosticDescriptor DescriptorNotFollowed = - new DiagnosticDescriptor(DiagnosticId, Title, MessageNotFollowed, AnalyzerCategory.SpacingRules, DiagnosticSeverity.Warning, AnalyzerConstants.EnabledByDefault, Description, HelpLink); -#pragma warning restore SA1202 // Elements should be ordered by access - /// public override ImmutableArray SupportedDiagnostics { get; } = ImmutableArray.Create(DescriptorNotPreceded); @@ -125,9 +124,11 @@ private static void HandleMemberAccessSymbol(SyntaxTreeAnalysisContext context, { // Member access symbol '{.}' should not be {followed} by a space. var properties = TokenSpacingProperties.RemoveFollowing; +#pragma warning disable IDE0079 // Remove unnecessary suppression #pragma warning disable RS1005 // ReportDiagnostic invoked with an unsupported DiagnosticDescriptor (https://github.com/dotnet/roslyn-analyzers/issues/4103) context.ReportDiagnostic(Diagnostic.Create(DescriptorNotFollowed, token.GetLocation(), properties, token.Text)); #pragma warning restore RS1005 // ReportDiagnostic invoked with an unsupported DiagnosticDescriptor +#pragma warning restore IDE0079 // Remove unnecessary suppression } } } diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/SpacingRules/SA1023DereferenceAndAccessOfSymbolsMustBeSpacedCorrectly.cs b/StyleCop.Analyzers/StyleCop.Analyzers/SpacingRules/SA1023DereferenceAndAccessOfSymbolsMustBeSpacedCorrectly.cs index 8855745bd..2035ecdd4 100644 --- a/StyleCop.Analyzers/StyleCop.Analyzers/SpacingRules/SA1023DereferenceAndAccessOfSymbolsMustBeSpacedCorrectly.cs +++ b/StyleCop.Analyzers/StyleCop.Analyzers/SpacingRules/SA1023DereferenceAndAccessOfSymbolsMustBeSpacedCorrectly.cs @@ -48,19 +48,7 @@ internal class SA1023DereferenceAndAccessOfSymbolsMustBeSpacedCorrectly : Diagno /// analyzer. /// public const string DiagnosticId = "SA1023"; - private const string HelpLink = "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1023.md"; - private static readonly LocalizableString Title = new LocalizableResourceString(nameof(SpacingResources.SA1023Title), SpacingResources.ResourceManager, typeof(SpacingResources)); - private static readonly LocalizableString Description = new LocalizableResourceString(nameof(SpacingResources.SA1023Description), SpacingResources.ResourceManager, typeof(SpacingResources)); - - private static readonly LocalizableString MessageNotPreceded = new LocalizableResourceString(nameof(SpacingResources.SA1023MessageNotPreceded), SpacingResources.ResourceManager, typeof(SpacingResources)); - private static readonly LocalizableString MessageNotFollowed = new LocalizableResourceString(nameof(SpacingResources.SA1023MessageNotFollowed), SpacingResources.ResourceManager, typeof(SpacingResources)); - private static readonly LocalizableString MessageFollowed = new LocalizableResourceString(nameof(SpacingResources.SA1023MessageFollowed), SpacingResources.ResourceManager, typeof(SpacingResources)); - private static readonly LocalizableString MessageNotAtBeginningOfLine = new LocalizableResourceString(nameof(SpacingResources.SA1023MessageNotAtBeginningOfLine), SpacingResources.ResourceManager, typeof(SpacingResources)); - private static readonly LocalizableString MessageNotAtEndOfLine = new LocalizableResourceString(nameof(SpacingResources.SA1023MessageNotAtEndOfLine), SpacingResources.ResourceManager, typeof(SpacingResources)); - private static readonly Action SyntaxTreeAction = HandleSyntaxTree; - -#pragma warning disable SA1202 // Elements should be ordered by access internal static readonly DiagnosticDescriptor DescriptorNotPreceded = new DiagnosticDescriptor(DiagnosticId, Title, MessageNotPreceded, AnalyzerCategory.SpacingRules, DiagnosticSeverity.Warning, AnalyzerConstants.EnabledByDefault, Description, HelpLink); @@ -75,7 +63,18 @@ internal class SA1023DereferenceAndAccessOfSymbolsMustBeSpacedCorrectly : Diagno internal static readonly DiagnosticDescriptor DescriptorNotAtEndOfLine = new DiagnosticDescriptor(DiagnosticId, Title, MessageNotAtEndOfLine, AnalyzerCategory.SpacingRules, DiagnosticSeverity.Warning, AnalyzerConstants.EnabledByDefault, Description, HelpLink); -#pragma warning restore SA1202 // Elements should be ordered by access + + private const string HelpLink = "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1023.md"; + private static readonly LocalizableString Title = new LocalizableResourceString(nameof(SpacingResources.SA1023Title), SpacingResources.ResourceManager, typeof(SpacingResources)); + private static readonly LocalizableString Description = new LocalizableResourceString(nameof(SpacingResources.SA1023Description), SpacingResources.ResourceManager, typeof(SpacingResources)); + + private static readonly LocalizableString MessageNotPreceded = new LocalizableResourceString(nameof(SpacingResources.SA1023MessageNotPreceded), SpacingResources.ResourceManager, typeof(SpacingResources)); + private static readonly LocalizableString MessageNotFollowed = new LocalizableResourceString(nameof(SpacingResources.SA1023MessageNotFollowed), SpacingResources.ResourceManager, typeof(SpacingResources)); + private static readonly LocalizableString MessageFollowed = new LocalizableResourceString(nameof(SpacingResources.SA1023MessageFollowed), SpacingResources.ResourceManager, typeof(SpacingResources)); + private static readonly LocalizableString MessageNotAtBeginningOfLine = new LocalizableResourceString(nameof(SpacingResources.SA1023MessageNotAtBeginningOfLine), SpacingResources.ResourceManager, typeof(SpacingResources)); + private static readonly LocalizableString MessageNotAtEndOfLine = new LocalizableResourceString(nameof(SpacingResources.SA1023MessageNotAtEndOfLine), SpacingResources.ResourceManager, typeof(SpacingResources)); + + private static readonly Action SyntaxTreeAction = HandleSyntaxTree; /// public override ImmutableArray SupportedDiagnostics { get; } = @@ -194,9 +193,11 @@ private static void HandleAsteriskToken(SyntaxTreeAnalysisContext context, Synta { // Dereference symbol '*' should {not appear at the beginning of a line}. var properties = TokenSpacingProperties.RemovePreceding; +#pragma warning disable IDE0079 // Remove unnecessary suppression #pragma warning disable RS1005 // ReportDiagnostic invoked with an unsupported DiagnosticDescriptor (https://github.com/dotnet/roslyn-analyzers/issues/4103) context.ReportDiagnostic(Diagnostic.Create(DescriptorNotAtBeginningOfLine, token.GetLocation(), properties)); #pragma warning restore RS1005 // ReportDiagnostic invoked with an unsupported DiagnosticDescriptor +#pragma warning restore IDE0079 // Remove unnecessary suppression } else if (allowAtLineStart && firstInLine) { @@ -213,26 +214,32 @@ private static void HandleAsteriskToken(SyntaxTreeAnalysisContext context, Synta { // Dereference symbol '*' should {not appear at the end of a line}. var properties = TokenSpacingProperties.RemoveFollowing; +#pragma warning disable IDE0079 // Remove unnecessary suppression #pragma warning disable RS1005 // ReportDiagnostic invoked with an unsupported DiagnosticDescriptor (https://github.com/dotnet/roslyn-analyzers/issues/4103) context.ReportDiagnostic(Diagnostic.Create(DescriptorNotAtEndOfLine, token.GetLocation(), properties)); #pragma warning restore RS1005 // ReportDiagnostic invoked with an unsupported DiagnosticDescriptor +#pragma warning restore IDE0079 // Remove unnecessary suppression } else if (!allowTrailingSpace && followedBySpace) { // Dereference symbol '*' should {not be followed by a space}. var properties = TokenSpacingProperties.RemoveFollowing; +#pragma warning disable IDE0079 // Remove unnecessary suppression #pragma warning disable RS1005 // ReportDiagnostic invoked with an unsupported DiagnosticDescriptor (https://github.com/dotnet/roslyn-analyzers/issues/4103) context.ReportDiagnostic(Diagnostic.Create(DescriptorNotFollowed, token.GetLocation(), properties)); #pragma warning restore RS1005 // ReportDiagnostic invoked with an unsupported DiagnosticDescriptor +#pragma warning restore IDE0079 // Remove unnecessary suppression } if (!followedBySpace && allowTrailingSpace) { // Dereference symbol '*' should {be followed by a space}. var properties = TokenSpacingProperties.InsertFollowing; +#pragma warning disable IDE0079 // Remove unnecessary suppression #pragma warning disable RS1005 // ReportDiagnostic invoked with an unsupported DiagnosticDescriptor (https://github.com/dotnet/roslyn-analyzers/issues/4103) context.ReportDiagnostic(Diagnostic.Create(DescriptorFollowed, token.GetLocation(), properties)); #pragma warning restore RS1005 // ReportDiagnostic invoked with an unsupported DiagnosticDescriptor +#pragma warning restore IDE0079 // Remove unnecessary suppression } } } diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/SpacingRules/SA1024ColonsMustBeSpacedCorrectly.cs b/StyleCop.Analyzers/StyleCop.Analyzers/SpacingRules/SA1024ColonsMustBeSpacedCorrectly.cs index fb200343c..b526e2f0e 100644 --- a/StyleCop.Analyzers/StyleCop.Analyzers/SpacingRules/SA1024ColonsMustBeSpacedCorrectly.cs +++ b/StyleCop.Analyzers/StyleCop.Analyzers/SpacingRules/SA1024ColonsMustBeSpacedCorrectly.cs @@ -65,6 +65,16 @@ internal class SA1024ColonsMustBeSpacedCorrectly : DiagnosticAnalyzer /// The ID for diagnostics produced by the analyzer. /// public const string DiagnosticId = "SA1024"; + + internal static readonly DiagnosticDescriptor DescriptorNotPreceded = + new DiagnosticDescriptor(DiagnosticId, Title, MessageNotPreceded, AnalyzerCategory.SpacingRules, DiagnosticSeverity.Warning, AnalyzerConstants.EnabledByDefault, Description, HelpLink); + + internal static readonly DiagnosticDescriptor DescriptorPreceded = + new DiagnosticDescriptor(DiagnosticId, Title, MessagePreceded, AnalyzerCategory.SpacingRules, DiagnosticSeverity.Warning, AnalyzerConstants.EnabledByDefault, Description, HelpLink); + + internal static readonly DiagnosticDescriptor DescriptorFollowed = + new DiagnosticDescriptor(DiagnosticId, Title, MessageFollowed, AnalyzerCategory.SpacingRules, DiagnosticSeverity.Warning, AnalyzerConstants.EnabledByDefault, Description, HelpLink); + private const string HelpLink = "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1024.md"; private static readonly LocalizableString Title = new LocalizableResourceString(nameof(SpacingResources.SA1024Title), SpacingResources.ResourceManager, typeof(SpacingResources)); private static readonly LocalizableString MessageFormat = new LocalizableResourceString(nameof(SpacingResources.SA1024MessageNotPreceded), SpacingResources.ResourceManager, typeof(SpacingResources)); @@ -76,17 +86,6 @@ internal class SA1024ColonsMustBeSpacedCorrectly : DiagnosticAnalyzer private static readonly Action SyntaxTreeAction = HandleSyntaxTree; -#pragma warning disable SA1202 // Elements should be ordered by access - internal static readonly DiagnosticDescriptor DescriptorNotPreceded = - new DiagnosticDescriptor(DiagnosticId, Title, MessageNotPreceded, AnalyzerCategory.SpacingRules, DiagnosticSeverity.Warning, AnalyzerConstants.EnabledByDefault, Description, HelpLink); - - internal static readonly DiagnosticDescriptor DescriptorPreceded = - new DiagnosticDescriptor(DiagnosticId, Title, MessagePreceded, AnalyzerCategory.SpacingRules, DiagnosticSeverity.Warning, AnalyzerConstants.EnabledByDefault, Description, HelpLink); - - internal static readonly DiagnosticDescriptor DescriptorFollowed = - new DiagnosticDescriptor(DiagnosticId, Title, MessageFollowed, AnalyzerCategory.SpacingRules, DiagnosticSeverity.Warning, AnalyzerConstants.EnabledByDefault, Description, HelpLink); -#pragma warning restore SA1202 // Elements should be ordered by access - /// public override ImmutableArray SupportedDiagnostics { get; } = ImmutableArray.Create(DescriptorNotPreceded); @@ -185,9 +184,11 @@ private static void HandleColonToken(SyntaxTreeAnalysisContext context, SyntaxTo if (missingFollowingSpace && checkRequireAfter) { // colon should{} be {followed}{} by a space +#pragma warning disable IDE0079 // Remove unnecessary suppression #pragma warning disable RS1005 // ReportDiagnostic invoked with an unsupported DiagnosticDescriptor (https://github.com/dotnet/roslyn-analyzers/issues/4103) context.ReportDiagnostic(Diagnostic.Create(DescriptorFollowed, token.GetLocation(), TokenSpacingProperties.InsertFollowing)); #pragma warning restore RS1005 // ReportDiagnostic invoked with an unsupported DiagnosticDescriptor +#pragma warning restore IDE0079 // Remove unnecessary suppression } } } diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/SpecialRules/SA0002InvalidSettingsFile.cs b/StyleCop.Analyzers/StyleCop.Analyzers/SpecialRules/SA0002InvalidSettingsFile.cs index 8bb93b623..2a159daf0 100644 --- a/StyleCop.Analyzers/StyleCop.Analyzers/SpecialRules/SA0002InvalidSettingsFile.cs +++ b/StyleCop.Analyzers/StyleCop.Analyzers/SpecialRules/SA0002InvalidSettingsFile.cs @@ -29,9 +29,11 @@ internal class SA0002InvalidSettingsFile : DiagnosticAnalyzer private static readonly LocalizableString Description = new LocalizableResourceString(nameof(SpecialResources.SA0002Description), SpecialResources.ResourceManager, typeof(SpecialResources)); private static readonly DiagnosticDescriptor Descriptor = +#pragma warning disable IDE0079 // Remove unnecessary suppression #pragma warning disable RS1033 // Define diagnostic description correctly (Description ends with formatted exception text) new DiagnosticDescriptor(DiagnosticId, Title, MessageFormat, AnalyzerCategory.SpecialRules, DiagnosticSeverity.Warning, AnalyzerConstants.EnabledByDefault, Description, HelpLink, customTags: new[] { "CompilationEnd" }); #pragma warning restore RS1033 // Define diagnostic description correctly +#pragma warning restore IDE0079 // Remove unnecessary suppression private static readonly Action CompilationAction = HandleCompilation;