Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simplify AbstractBuiltInCodeStyleDiagnosticAnalyzer constructors #62826

Merged
merged 5 commits into from
Jul 22, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ public CSharpAddBracesDiagnosticAnalyzer()
: base(IDEDiagnosticIds.AddBracesDiagnosticId,
EnforceOnBuildValues.AddBraces,
CSharpCodeStyleOptions.PreferBraces,
LanguageNames.CSharp,
new LocalizableResourceString(nameof(CSharpAnalyzersResources.Add_braces), CSharpAnalyzersResources.ResourceManager, typeof(CSharpAnalyzersResources)),
new LocalizableResourceString(nameof(CSharpAnalyzersResources.Add_braces_to_0_statement), CSharpAnalyzersResources.ResourceManager, typeof(CSharpAnalyzersResources)))
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ public ConvertToBlockScopedNamespaceDiagnosticAnalyzer()
: base(IDEDiagnosticIds.UseBlockScopedNamespaceDiagnosticId,
EnforceOnBuildValues.UseBlockScopedNamespace,
CSharpCodeStyleOptions.NamespaceDeclarations,
LanguageNames.CSharp,
new LocalizableResourceString(nameof(CSharpAnalyzersResources.Convert_to_block_scoped_namespace), CSharpAnalyzersResources.ResourceManager, typeof(CSharpAnalyzersResources)))
{
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ public ConvertToFileScopedNamespaceDiagnosticAnalyzer()
: base(IDEDiagnosticIds.UseFileScopedNamespaceDiagnosticId,
EnforceOnBuildValues.UseFileScopedNamespace,
CSharpCodeStyleOptions.NamespaceDeclarations,
LanguageNames.CSharp,
new LocalizableResourceString(nameof(CSharpAnalyzersResources.Convert_to_file_scoped_namespace), CSharpAnalyzersResources.ResourceManager, typeof(CSharpAnalyzersResources)))
{
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ public ConvertToProgramMainDiagnosticAnalyzer()
IDEDiagnosticIds.UseProgramMainId,
EnforceOnBuildValues.UseProgramMain,
CSharpCodeStyleOptions.PreferTopLevelStatements,
LanguageNames.CSharp,
new LocalizableResourceString(nameof(CSharpAnalyzersResources.Convert_to_Program_Main_style_program), CSharpAnalyzersResources.ResourceManager, typeof(CSharpAnalyzersResources)))
{
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ public ConvertToTopLevelStatementsDiagnosticAnalyzer()
IDEDiagnosticIds.UseTopLevelStatementsId,
EnforceOnBuildValues.UseTopLevelStatements,
CSharpCodeStyleOptions.PreferTopLevelStatements,
LanguageNames.CSharp,
new LocalizableResourceString(nameof(CSharpAnalyzersResources.Convert_to_top_level_statements), CSharpAnalyzersResources.ResourceManager, typeof(CSharpAnalyzersResources)))
{
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ public ConvertSwitchStatementToExpressionDiagnosticAnalyzer()
: base(IDEDiagnosticIds.ConvertSwitchStatementToExpressionDiagnosticId,
EnforceOnBuildValues.ConvertSwitchStatementToExpression,
CSharpCodeStyleOptions.PreferSwitchExpression,
LanguageNames.CSharp,
new LocalizableResourceString(nameof(CSharpAnalyzersResources.Convert_switch_statement_to_expression), CSharpAnalyzersResources.ResourceManager, typeof(CSharpAnalyzersResources)),
new LocalizableResourceString(nameof(CSharpAnalyzersResources.Use_switch_expression), CSharpAnalyzersResources.ResourceManager, typeof(CSharpAnalyzersResources)))
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ internal sealed class CSharpConvertTypeOfToNameOfDiagnosticAnalyzer : AbstractCo
{
private static readonly string s_title = CSharpAnalyzersResources.typeof_can_be_converted__to_nameof;

public CSharpConvertTypeOfToNameOfDiagnosticAnalyzer() : base(s_title, LanguageNames.CSharp)
public CSharpConvertTypeOfToNameOfDiagnosticAnalyzer() : base(s_title)
{
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,6 @@ namespace Microsoft.CodeAnalysis.CSharp.FileHeaders
[DiagnosticAnalyzer(LanguageNames.CSharp)]
internal class CSharpFileHeaderDiagnosticAnalyzer : AbstractFileHeaderDiagnosticAnalyzer
{
public CSharpFileHeaderDiagnosticAnalyzer()
: base(LanguageNames.CSharp)
{
}

protected override AbstractFileHeaderHelper FileHeaderHelper => CSharpFileHeaderHelper.Instance;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ public CSharpInlineDeclarationDiagnosticAnalyzer()
: base(IDEDiagnosticIds.InlineDeclarationDiagnosticId,
EnforceOnBuildValues.InlineDeclaration,
CSharpCodeStyleOptions.PreferInlinedVariableDeclaration,
LanguageNames.CSharp,
new LocalizableResourceString(nameof(CSharpAnalyzersResources.Inline_variable_declaration), CSharpAnalyzersResources.ResourceManager, typeof(CSharpAnalyzersResources)),
new LocalizableResourceString(nameof(CSharpAnalyzersResources.Variable_declaration_can_be_inlined), CSharpAnalyzersResources.ResourceManager, typeof(CSharpAnalyzersResources)))
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ public InvokeDelegateWithConditionalAccessAnalyzer()
: base(IDEDiagnosticIds.InvokeDelegateWithConditionalAccessId,
EnforceOnBuildValues.InvokeDelegateWithConditionalAccess,
CSharpCodeStyleOptions.PreferConditionalDelegateCall,
LanguageNames.CSharp,
new LocalizableResourceString(nameof(CSharpAnalyzersResources.Delegate_invocation_can_be_simplified), CSharpAnalyzersResources.ResourceManager, typeof(CSharpAnalyzersResources)))
{
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ public MakeLocalFunctionStaticDiagnosticAnalyzer()
: base(IDEDiagnosticIds.MakeLocalFunctionStaticDiagnosticId,
EnforceOnBuildValues.MakeLocalFunctionStatic,
CSharpCodeStyleOptions.PreferStaticLocalFunction,
LanguageNames.CSharp,
new LocalizableResourceString(nameof(CSharpAnalyzersResources.Make_local_function_static), CSharpAnalyzersResources.ResourceManager, typeof(CSharpAnalyzersResources)),
new LocalizableResourceString(nameof(CSharpAnalyzersResources.Local_function_can_be_made_static), CSharpAnalyzersResources.ResourceManager, typeof(CSharpAnalyzersResources)))
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,9 @@ internal sealed class MisplacedUsingDirectivesDiagnosticAnalyzer : AbstractBuilt
s_localizableTitle, s_localizableInsideMessage);

public MisplacedUsingDirectivesDiagnosticAnalyzer()
: base(ImmutableDictionary<DiagnosticDescriptor, ISingleValuedOption>.Empty
: base(ImmutableDictionary<DiagnosticDescriptor, IOption2>.Empty
.Add(s_outsideDiagnosticDescriptor, CSharpCodeStyleOptions.PreferredUsingDirectivePlacement)
.Add(s_insideDiagnosticDescriptor, CSharpCodeStyleOptions.PreferredUsingDirectivePlacement),
LanguageNames.CSharp)
.Add(s_insideDiagnosticDescriptor, CSharpCodeStyleOptions.PreferredUsingDirectivePlacement))
{
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ public ConsecutiveBracePlacementDiagnosticAnalyzer()
: base(IDEDiagnosticIds.ConsecutiveBracePlacementDiagnosticId,
EnforceOnBuildValues.ConsecutiveBracePlacement,
CSharpCodeStyleOptions.AllowBlankLinesBetweenConsecutiveBraces,
LanguageNames.CSharp,
new LocalizableResourceString(
nameof(CSharpAnalyzersResources.Consecutive_braces_must_not_have_a_blank_between_them), CSharpAnalyzersResources.ResourceManager, typeof(CSharpAnalyzersResources)))
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ public ConstructorInitializerPlacementDiagnosticAnalyzer()
: base(IDEDiagnosticIds.ConstructorInitializerPlacementDiagnosticId,
EnforceOnBuildValues.ConsecutiveBracePlacement,
CSharpCodeStyleOptions.AllowBlankLineAfterColonInConstructorInitializer,
LanguageNames.CSharp,
new LocalizableResourceString(
nameof(CSharpAnalyzersResources.Blank_line_not_allowed_after_constructor_initializer_colon), CSharpAnalyzersResources.ResourceManager, typeof(CSharpAnalyzersResources)))
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ public EmbeddedStatementPlacementDiagnosticAnalyzer()
: base(IDEDiagnosticIds.EmbeddedStatementPlacementDiagnosticId,
EnforceOnBuildValues.EmbeddedStatementPlacement,
CSharpCodeStyleOptions.AllowEmbeddedStatementsOnSameLine,
LanguageNames.CSharp,
new LocalizableResourceString(
nameof(CSharpAnalyzersResources.Embedded_statements_must_be_on_their_own_line), CSharpAnalyzersResources.ResourceManager, typeof(CSharpAnalyzersResources)))
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ internal class CSharpOrderModifiersDiagnosticAnalyzer : AbstractOrderModifiersDi
public CSharpOrderModifiersDiagnosticAnalyzer()
: base(CSharpSyntaxFacts.Instance,
CSharpCodeStyleOptions.PreferredModifierOrder,
CSharpOrderModifiersHelper.Instance,
LanguageNames.CSharp)
CSharpOrderModifiersHelper.Instance)
{
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ public CSharpRemoveUnnecessaryLambdaExpressionDiagnosticAnalyzer()
EnforceOnBuildValues.RemoveUnnecessaryLambdaExpression,
CSharpCodeStyleOptions.PreferMethodGroupConversion,
fadingOption: null,
LanguageNames.CSharp,
new LocalizableResourceString(nameof(CSharpAnalyzersResources.Remove_unnecessary_lambda_expression), CSharpAnalyzersResources.ResourceManager, typeof(CSharpAnalyzersResources)),
new LocalizableResourceString(nameof(CSharpAnalyzersResources.Lambda_expression_can_be_removed), CSharpAnalyzersResources.ResourceManager, typeof(CSharpAnalyzersResources)))
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ internal sealed class CSharpRemoveUnusedParametersAndValuesDiagnosticAnalyzer :
{
public CSharpRemoveUnusedParametersAndValuesDiagnosticAnalyzer()
: base(unusedValueExpressionStatementOption: CSharpCodeStyleOptions.UnusedValueExpressionStatement,
unusedValueAssignmentOption: CSharpCodeStyleOptions.UnusedValueAssignment,
LanguageNames.CSharp)
unusedValueAssignmentOption: CSharpCodeStyleOptions.UnusedValueAssignment)
{
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ public CSharpSimplifyPropertyPatternDiagnosticAnalyzer()
: base(IDEDiagnosticIds.SimplifyPropertyPatternDiagnosticId,
EnforceOnBuildValues.SimplifyPropertyPattern,
CSharpCodeStyleOptions.PreferExtendedPropertyPattern,
LanguageNames.CSharp,
new LocalizableResourceString(nameof(CSharpAnalyzersResources.Property_pattern_can_be_simplified), CSharpAnalyzersResources.ResourceManager, typeof(CSharpAnalyzersResources)),
new LocalizableResourceString(nameof(CSharpAnalyzersResources.Simplify_property_pattern), CSharpAnalyzersResources.ResourceManager, typeof(CSharpAnalyzersResources)))
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ public CSharpUseDeconstructionDiagnosticAnalyzer()
: base(IDEDiagnosticIds.UseDeconstructionDiagnosticId,
EnforceOnBuildValues.UseDeconstruction,
CSharpCodeStyleOptions.PreferDeconstructedVariableDeclaration,
LanguageNames.CSharp,
new LocalizableResourceString(nameof(CSharpAnalyzersResources.Deconstruct_variable_declaration), CSharpAnalyzersResources.ResourceManager, typeof(CSharpAnalyzersResources)),
new LocalizableResourceString(nameof(CSharpAnalyzersResources.Variable_declaration_can_be_deconstructed), CSharpAnalyzersResources.ResourceManager, typeof(CSharpAnalyzersResources)))
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ public CSharpUseDefaultLiteralDiagnosticAnalyzer()
EnforceOnBuildValues.UseDefaultLiteral,
CSharpCodeStyleOptions.PreferSimpleDefaultExpression,
fadingOption: null,
LanguageNames.CSharp,
new LocalizableResourceString(nameof(CSharpAnalyzersResources.Simplify_default_expression), CSharpAnalyzersResources.ResourceManager, typeof(CSharpAnalyzersResources)),
new LocalizableResourceString(nameof(CSharpAnalyzersResources.default_expression_can_be_simplified), CSharpAnalyzersResources.ResourceManager, typeof(CSharpAnalyzersResources)))
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ internal class UseExpressionBodyDiagnosticAnalyzer : AbstractBuiltInCodeStyleDia
private static readonly ImmutableArray<UseExpressionBodyHelper> _helpers = UseExpressionBodyHelper.Helpers;

public UseExpressionBodyDiagnosticAnalyzer()
: base(GetSupportedDescriptorsWithOptions(), LanguageNames.CSharp)
: base(GetSupportedDescriptorsWithOptions())
{
_syntaxKinds = _helpers.SelectMany(h => h.SyntaxKinds).ToImmutableArray();
}

private static ImmutableDictionary<DiagnosticDescriptor, ISingleValuedOption> GetSupportedDescriptorsWithOptions()
private static ImmutableDictionary<DiagnosticDescriptor, IOption2> GetSupportedDescriptorsWithOptions()
{
var builder = ImmutableDictionary.CreateBuilder<DiagnosticDescriptor, ISingleValuedOption>();
var builder = ImmutableDictionary.CreateBuilder<DiagnosticDescriptor, IOption2>();
foreach (var helper in _helpers)
{
var descriptor = CreateDescriptorWithId(helper.DiagnosticId, helper.EnforceOnBuild, helper.UseExpressionBodyTitle, helper.UseExpressionBodyTitle);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,9 @@ internal sealed class UseExpressionBodyForLambdaDiagnosticAnalyzer : AbstractBui
private static readonly DiagnosticDescriptor s_useBlockBodyForLambda = CreateDescriptorWithId(UseExpressionBodyForLambdaHelpers.UseBlockBodyTitle, UseExpressionBodyForLambdaHelpers.UseBlockBodyTitle);

public UseExpressionBodyForLambdaDiagnosticAnalyzer() : base(
ImmutableDictionary<DiagnosticDescriptor, Options.ISingleValuedOption>.Empty
ImmutableDictionary<DiagnosticDescriptor, Options.IOption2>.Empty
.Add(s_useExpressionBodyForLambda, CSharpCodeStyleOptions.PreferExpressionBodiedLambdas)
.Add(s_useBlockBodyForLambda, CSharpCodeStyleOptions.PreferExpressionBodiedLambdas),
LanguageNames.CSharp)
.Add(s_useBlockBodyForLambda, CSharpCodeStyleOptions.PreferExpressionBodiedLambdas))
{
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ public CSharpUseImplicitObjectCreationDiagnosticAnalyzer()
: base(IDEDiagnosticIds.UseImplicitObjectCreationDiagnosticId,
EnforceOnBuildValues.UseImplicitObjectCreation,
CSharpCodeStyleOptions.ImplicitObjectCreationWhenTypeIsApparent,
LanguageNames.CSharp,
new LocalizableResourceString(nameof(CSharpAnalyzersResources.Use_new), CSharpAnalyzersResources.ResourceManager, typeof(CSharpAnalyzersResources)),
new LocalizableResourceString(nameof(CSharpAnalyzersResources.new_expression_can_be_simplified), CSharpAnalyzersResources.ResourceManager, typeof(CSharpAnalyzersResources)))
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ protected CSharpTypeStyleDiagnosticAnalyzerBase(
string diagnosticId, EnforceOnBuild enforceOnBuild, LocalizableString title, LocalizableString message)
: base(diagnosticId,
enforceOnBuild,
ImmutableHashSet.Create<ISingleValuedOption>(CSharpCodeStyleOptions.VarForBuiltInTypes, CSharpCodeStyleOptions.VarWhenTypeIsApparent, CSharpCodeStyleOptions.VarElsewhere),
LanguageNames.CSharp,
ImmutableHashSet.Create<IOption2>(CSharpCodeStyleOptions.VarForBuiltInTypes, CSharpCodeStyleOptions.VarWhenTypeIsApparent, CSharpCodeStyleOptions.VarElsewhere),
title, message)
{
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ public CSharpUseIndexOperatorDiagnosticAnalyzer()
: base(IDEDiagnosticIds.UseIndexOperatorDiagnosticId,
EnforceOnBuildValues.UseIndexOperator,
CSharpCodeStyleOptions.PreferIndexOperator,
LanguageNames.CSharp,
new LocalizableResourceString(nameof(CSharpAnalyzersResources.Use_index_operator), CSharpAnalyzersResources.ResourceManager, typeof(CSharpAnalyzersResources)),
new LocalizableResourceString(nameof(CSharpAnalyzersResources.Indexing_can_be_simplified), CSharpAnalyzersResources.ResourceManager, typeof(CSharpAnalyzersResources)))
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ public CSharpUseRangeOperatorDiagnosticAnalyzer()
: base(IDEDiagnosticIds.UseRangeOperatorDiagnosticId,
EnforceOnBuildValues.UseRangeOperator,
CSharpCodeStyleOptions.PreferRangeOperator,
LanguageNames.CSharp,
new LocalizableResourceString(nameof(CSharpAnalyzersResources.Use_range_operator), CSharpAnalyzersResources.ResourceManager, typeof(CSharpAnalyzersResources)),
new LocalizableResourceString(nameof(CSharpAnalyzersResources._0_can_be_simplified), CSharpAnalyzersResources.ResourceManager, typeof(CSharpAnalyzersResources)))
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public CSharpUseIsNullCheckForCastAndEqualityOperatorDiagnosticAnalyzer()
: base(IDEDiagnosticIds.UseIsNullCheckDiagnosticId,
EnforceOnBuildValues.UseIsNullCheck,
CodeStyleOptions2.PreferIsNullCheckOverReferenceEqualityMethod,
CSharpAnalyzersResources.Use_is_null_check,
new LocalizableResourceString(nameof(CSharpAnalyzersResources.Use_is_null_check), CSharpAnalyzersResources.ResourceManager, typeof(CSharpAnalyzersResources)),
mavasani marked this conversation as resolved.
Show resolved Hide resolved
new LocalizableResourceString(nameof(AnalyzersResources.Null_check_can_be_simplified), AnalyzersResources.ResourceManager, typeof(AnalyzersResources)))
{
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ public CSharpUseNullCheckOverTypeCheckDiagnosticAnalyzer()
: base(IDEDiagnosticIds.UseNullCheckOverTypeCheckDiagnosticId,
EnforceOnBuildValues.UseNullCheckOverTypeCheck,
CSharpCodeStyleOptions.PreferNullCheckOverTypeCheck,
LanguageNames.CSharp,
new LocalizableResourceString(nameof(CSharpAnalyzersResources.Prefer_null_check_over_type_check), CSharpAnalyzersResources.ResourceManager, typeof(CSharpAnalyzersResources)),
new LocalizableResourceString(nameof(CSharpAnalyzersResources.Null_check_can_be_clarified), CSharpAnalyzersResources.ResourceManager, typeof(CSharpAnalyzersResources)))
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ public CSharpUseLocalFunctionDiagnosticAnalyzer()
: base(IDEDiagnosticIds.UseLocalFunctionDiagnosticId,
EnforceOnBuildValues.UseLocalFunction,
CSharpCodeStyleOptions.PreferLocalOverAnonymousFunction,
LanguageNames.CSharp,
new LocalizableResourceString(
nameof(CSharpAnalyzersResources.Use_local_function), CSharpAnalyzersResources.ResourceManager, typeof(CSharpAnalyzersResources)))
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ public CSharpUsePatternCombinatorsDiagnosticAnalyzer()
: base(IDEDiagnosticIds.UsePatternCombinatorsDiagnosticId,
EnforceOnBuildValues.UsePatternCombinators,
CSharpCodeStyleOptions.PreferPatternMatching,
LanguageNames.CSharp,
s_safePatternTitle,
s_safePatternTitle)
{
Expand Down
Loading