From 140bda62470adbc3b5bf2d075680a2f9d3de32bc Mon Sep 17 00:00:00 2001 From: Youssef1313 Date: Thu, 21 Jul 2022 12:34:31 +0200 Subject: [PATCH 1/2] Simplify AbstractBuiltInCodeStyleDiagnosticAnalyzer constructors --- .../CSharpAddBracesDiagnosticAnalyzer.cs | 1 - ...oBlockScopedNamespaceDiagnosticAnalyzer.cs | 1 - ...ToFileScopedNamespaceDiagnosticAnalyzer.cs | 1 - .../ConvertToProgramMainDiagnosticAnalyzer.cs | 1 - ...tToTopLevelStatementsDiagnosticAnalyzer.cs | 1 - ...StatementToExpressionDiagnosticAnalyzer.cs | 1 - ...ConvertTypeOfToNameOfDiagnosticAnalyzer.cs | 2 +- .../CSharpFileHeaderDiagnosticAnalyzer.cs | 5 - ...harpInlineDeclarationDiagnosticAnalyzer.cs | 1 - ...keDelegateWithConditionalAccessAnalyzer.cs | 1 - ...keLocalFunctionStaticDiagnosticAnalyzer.cs | 1 - ...placedUsingDirectivesDiagnosticAnalyzer.cs | 5 +- ...ecutiveBracePlacementDiagnosticAnalyzer.cs | 1 - ...rInitializerPlacementDiagnosticAnalyzer.cs | 1 - ...dedStatementPlacementDiagnosticAnalyzer.cs | 1 - .../CSharpOrderModifiersDiagnosticAnalyzer.cs | 3 +- ...ssaryLambdaExpressionDiagnosticAnalyzer.cs | 1 - ...edParametersAndValuesDiagnosticAnalyzer.cs | 3 +- ...mplifyPropertyPatternDiagnosticAnalyzer.cs | 1 - ...harpUseDeconstructionDiagnosticAnalyzer.cs | 1 - ...harpUseDefaultLiteralDiagnosticAnalyzer.cs | 1 - .../UseExpressionBodyDiagnosticAnalyzer.cs | 6 +- ...mplicitObjectCreationDiagnosticAnalyzer.cs | 1 - .../CSharpTypeStyleDiagnosticAnalyzerBase.cs | 3 +- ...SharpUseIndexOperatorDiagnosticAnalyzer.cs | 1 - ...SharpUseRangeOperatorDiagnosticAnalyzer.cs | 1 - ...stAndEqualityOperatorDiagnosticAnalyzer.cs | 2 +- ...ullCheckOverTypeCheckDiagnosticAnalyzer.cs | 1 - ...SharpUseLocalFunctionDiagnosticAnalyzer.cs | 1 - ...UsePatternCombinatorsDiagnosticAnalyzer.cs | 1 - .../CSharpAsAndNullCheckDiagnosticAnalyzer.cs | 1 - .../CSharpIsAndCastCheckDiagnosticAnalyzer.cs | 1 - .../CSharpUseNotPatternDiagnosticAnalyzer.cs | 1 - ...eSimpleUsingStatementDiagnosticAnalyzer.cs | 1 - ...arpUseThrowExpressionDiagnosticAnalyzer.cs | 2 +- .../CSharpUseTupleSwapDiagnosticAnalyzer.cs | 1 - .../UseUtf8StringLiteralDiagnosticAnalyzer.cs | 1 - ...tractBuiltInCodeStyleDiagnosticAnalyzer.cs | 126 ++---------------- ...nUnnecessaryCodeStyleDiagnosticAnalyzer.cs | 41 +----- .../AbstractParenthesesDiagnosticAnalyzer.cs | 2 +- ...ConvertTypeOfToNameOfDiagnosticAnalyzer.cs | 3 +- .../AbstractFileHeaderDiagnosticAnalyzer.cs | 7 +- .../AbstractForEachCastDiagnosticAnalyzer.cs | 1 - .../IDEDiagnosticIdToOptionMappingHelper.cs | 55 +++++--- ...iveStatementPlacementDiagnosticAnalyzer.cs | 1 - ...actMultipleBlankLinesDiagnosticAnalyzer.cs | 1 - ...bstractOrderModifiersDiagnosticAnalyzer.cs | 4 +- ...ctQualifyMemberAccessDiagnosticAnalyzer.cs | 2 +- ...edParametersAndValuesDiagnosticAnalyzer.cs | 11 +- ...CollectionInitializerDiagnosticAnalyzer.cs | 2 +- ...UseInferredMemberNameDiagnosticAnalyzer.cs | 2 +- ...tUseObjectInitializerDiagnosticAnalyzer.cs | 2 +- ...actUseThrowExpressionDiagnosticAnalyzer.cs | 3 +- ...ConvertTypeOfToNameOfDiagnosticAnalyzer.vb | 2 +- ...VisualBasicFileHeaderDiagnosticAnalyzer.vb | 5 - ...alBasicOrderModifiersDiagnosticAnalyzer.vb | 3 +- ...edParametersAndValuesDiagnosticAnalyzer.vb | 3 +- ...implifyObjectCreationDiagnosticAnalyzer.vb | 1 - .../VisualBasicUseIsNotDiagnosticAnalyzer.vb | 1 - ...dCastCheckWithoutNameDiagnosticAnalyzer.cs | 1 - .../AbstractCodeStyleProvider.Analysis.cs | 1 - ...eferFrameworkTypeDiagnosticAnalyzerBase.cs | 2 +- ...tractSimplifyThisOrMeDiagnosticAnalyzer.cs | 2 +- 63 files changed, 80 insertions(+), 263 deletions(-) diff --git a/src/Analyzers/CSharp/Analyzers/AddBraces/CSharpAddBracesDiagnosticAnalyzer.cs b/src/Analyzers/CSharp/Analyzers/AddBraces/CSharpAddBracesDiagnosticAnalyzer.cs index 9294203fccde4..93f3b892e63df 100644 --- a/src/Analyzers/CSharp/Analyzers/AddBraces/CSharpAddBracesDiagnosticAnalyzer.cs +++ b/src/Analyzers/CSharp/Analyzers/AddBraces/CSharpAddBracesDiagnosticAnalyzer.cs @@ -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))) { diff --git a/src/Analyzers/CSharp/Analyzers/ConvertNamespace/ConvertToBlockScopedNamespaceDiagnosticAnalyzer.cs b/src/Analyzers/CSharp/Analyzers/ConvertNamespace/ConvertToBlockScopedNamespaceDiagnosticAnalyzer.cs index b8288c97c4d5f..f04675b038e24 100644 --- a/src/Analyzers/CSharp/Analyzers/ConvertNamespace/ConvertToBlockScopedNamespaceDiagnosticAnalyzer.cs +++ b/src/Analyzers/CSharp/Analyzers/ConvertNamespace/ConvertToBlockScopedNamespaceDiagnosticAnalyzer.cs @@ -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))) { } diff --git a/src/Analyzers/CSharp/Analyzers/ConvertNamespace/ConvertToFileScopedNamespaceDiagnosticAnalyzer.cs b/src/Analyzers/CSharp/Analyzers/ConvertNamespace/ConvertToFileScopedNamespaceDiagnosticAnalyzer.cs index a1b53d61f3b65..5c39dd8da4e64 100644 --- a/src/Analyzers/CSharp/Analyzers/ConvertNamespace/ConvertToFileScopedNamespaceDiagnosticAnalyzer.cs +++ b/src/Analyzers/CSharp/Analyzers/ConvertNamespace/ConvertToFileScopedNamespaceDiagnosticAnalyzer.cs @@ -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))) { } diff --git a/src/Analyzers/CSharp/Analyzers/ConvertProgram/ConvertToProgramMainDiagnosticAnalyzer.cs b/src/Analyzers/CSharp/Analyzers/ConvertProgram/ConvertToProgramMainDiagnosticAnalyzer.cs index 65a76845f21e6..4a7c6cfe6b2a6 100644 --- a/src/Analyzers/CSharp/Analyzers/ConvertProgram/ConvertToProgramMainDiagnosticAnalyzer.cs +++ b/src/Analyzers/CSharp/Analyzers/ConvertProgram/ConvertToProgramMainDiagnosticAnalyzer.cs @@ -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))) { } diff --git a/src/Analyzers/CSharp/Analyzers/ConvertProgram/ConvertToTopLevelStatementsDiagnosticAnalyzer.cs b/src/Analyzers/CSharp/Analyzers/ConvertProgram/ConvertToTopLevelStatementsDiagnosticAnalyzer.cs index a432c494c0491..02465780f6acb 100644 --- a/src/Analyzers/CSharp/Analyzers/ConvertProgram/ConvertToTopLevelStatementsDiagnosticAnalyzer.cs +++ b/src/Analyzers/CSharp/Analyzers/ConvertProgram/ConvertToTopLevelStatementsDiagnosticAnalyzer.cs @@ -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))) { } diff --git a/src/Analyzers/CSharp/Analyzers/ConvertSwitchStatementToExpression/ConvertSwitchStatementToExpressionDiagnosticAnalyzer.cs b/src/Analyzers/CSharp/Analyzers/ConvertSwitchStatementToExpression/ConvertSwitchStatementToExpressionDiagnosticAnalyzer.cs index 7907456bd8568..6233414e64486 100644 --- a/src/Analyzers/CSharp/Analyzers/ConvertSwitchStatementToExpression/ConvertSwitchStatementToExpressionDiagnosticAnalyzer.cs +++ b/src/Analyzers/CSharp/Analyzers/ConvertSwitchStatementToExpression/ConvertSwitchStatementToExpressionDiagnosticAnalyzer.cs @@ -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))) { diff --git a/src/Analyzers/CSharp/Analyzers/ConvertTypeofToNameof/CSharpConvertTypeOfToNameOfDiagnosticAnalyzer.cs b/src/Analyzers/CSharp/Analyzers/ConvertTypeofToNameof/CSharpConvertTypeOfToNameOfDiagnosticAnalyzer.cs index 9f187df9f102a..4ab6f7f0ac1db 100644 --- a/src/Analyzers/CSharp/Analyzers/ConvertTypeofToNameof/CSharpConvertTypeOfToNameOfDiagnosticAnalyzer.cs +++ b/src/Analyzers/CSharp/Analyzers/ConvertTypeofToNameof/CSharpConvertTypeOfToNameOfDiagnosticAnalyzer.cs @@ -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) { } diff --git a/src/Analyzers/CSharp/Analyzers/FileHeaders/CSharpFileHeaderDiagnosticAnalyzer.cs b/src/Analyzers/CSharp/Analyzers/FileHeaders/CSharpFileHeaderDiagnosticAnalyzer.cs index 54d2f1c0e4a02..90c114c6f80e3 100644 --- a/src/Analyzers/CSharp/Analyzers/FileHeaders/CSharpFileHeaderDiagnosticAnalyzer.cs +++ b/src/Analyzers/CSharp/Analyzers/FileHeaders/CSharpFileHeaderDiagnosticAnalyzer.cs @@ -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; } } diff --git a/src/Analyzers/CSharp/Analyzers/InlineDeclaration/CSharpInlineDeclarationDiagnosticAnalyzer.cs b/src/Analyzers/CSharp/Analyzers/InlineDeclaration/CSharpInlineDeclarationDiagnosticAnalyzer.cs index 7f1cc89fb341b..ee1444eb8c8c6 100644 --- a/src/Analyzers/CSharp/Analyzers/InlineDeclaration/CSharpInlineDeclarationDiagnosticAnalyzer.cs +++ b/src/Analyzers/CSharp/Analyzers/InlineDeclaration/CSharpInlineDeclarationDiagnosticAnalyzer.cs @@ -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))) { diff --git a/src/Analyzers/CSharp/Analyzers/InvokeDelegateWithConditionalAccess/InvokeDelegateWithConditionalAccessAnalyzer.cs b/src/Analyzers/CSharp/Analyzers/InvokeDelegateWithConditionalAccess/InvokeDelegateWithConditionalAccessAnalyzer.cs index ba4751097221a..d3f916e7cd0b7 100644 --- a/src/Analyzers/CSharp/Analyzers/InvokeDelegateWithConditionalAccess/InvokeDelegateWithConditionalAccessAnalyzer.cs +++ b/src/Analyzers/CSharp/Analyzers/InvokeDelegateWithConditionalAccess/InvokeDelegateWithConditionalAccessAnalyzer.cs @@ -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))) { } diff --git a/src/Analyzers/CSharp/Analyzers/MakeLocalFunctionStatic/MakeLocalFunctionStaticDiagnosticAnalyzer.cs b/src/Analyzers/CSharp/Analyzers/MakeLocalFunctionStatic/MakeLocalFunctionStaticDiagnosticAnalyzer.cs index 47bb26366544d..3b8b5b0f05f92 100644 --- a/src/Analyzers/CSharp/Analyzers/MakeLocalFunctionStatic/MakeLocalFunctionStaticDiagnosticAnalyzer.cs +++ b/src/Analyzers/CSharp/Analyzers/MakeLocalFunctionStatic/MakeLocalFunctionStaticDiagnosticAnalyzer.cs @@ -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))) { diff --git a/src/Analyzers/CSharp/Analyzers/MisplacedUsingDirectives/MisplacedUsingDirectivesDiagnosticAnalyzer.cs b/src/Analyzers/CSharp/Analyzers/MisplacedUsingDirectives/MisplacedUsingDirectivesDiagnosticAnalyzer.cs index 620d9d10390af..c928e3dda44e4 100644 --- a/src/Analyzers/CSharp/Analyzers/MisplacedUsingDirectives/MisplacedUsingDirectivesDiagnosticAnalyzer.cs +++ b/src/Analyzers/CSharp/Analyzers/MisplacedUsingDirectives/MisplacedUsingDirectivesDiagnosticAnalyzer.cs @@ -38,10 +38,9 @@ internal sealed class MisplacedUsingDirectivesDiagnosticAnalyzer : AbstractBuilt s_localizableTitle, s_localizableInsideMessage); public MisplacedUsingDirectivesDiagnosticAnalyzer() - : base(ImmutableDictionary.Empty + : base(ImmutableDictionary.Empty .Add(s_outsideDiagnosticDescriptor, CSharpCodeStyleOptions.PreferredUsingDirectivePlacement) - .Add(s_insideDiagnosticDescriptor, CSharpCodeStyleOptions.PreferredUsingDirectivePlacement), - LanguageNames.CSharp) + .Add(s_insideDiagnosticDescriptor, CSharpCodeStyleOptions.PreferredUsingDirectivePlacement)) { } diff --git a/src/Analyzers/CSharp/Analyzers/NewLines/ConsecutiveBracePlacement/ConsecutiveBracePlacementDiagnosticAnalyzer.cs b/src/Analyzers/CSharp/Analyzers/NewLines/ConsecutiveBracePlacement/ConsecutiveBracePlacementDiagnosticAnalyzer.cs index 156d3ff51486c..340edf19eb893 100644 --- a/src/Analyzers/CSharp/Analyzers/NewLines/ConsecutiveBracePlacement/ConsecutiveBracePlacementDiagnosticAnalyzer.cs +++ b/src/Analyzers/CSharp/Analyzers/NewLines/ConsecutiveBracePlacement/ConsecutiveBracePlacementDiagnosticAnalyzer.cs @@ -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))) { diff --git a/src/Analyzers/CSharp/Analyzers/NewLines/ConstructorInitializerPlacement/ConstructorInitializerPlacementDiagnosticAnalyzer.cs b/src/Analyzers/CSharp/Analyzers/NewLines/ConstructorInitializerPlacement/ConstructorInitializerPlacementDiagnosticAnalyzer.cs index 2eb320a8024ad..8bbef0aeb40f7 100644 --- a/src/Analyzers/CSharp/Analyzers/NewLines/ConstructorInitializerPlacement/ConstructorInitializerPlacementDiagnosticAnalyzer.cs +++ b/src/Analyzers/CSharp/Analyzers/NewLines/ConstructorInitializerPlacement/ConstructorInitializerPlacementDiagnosticAnalyzer.cs @@ -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))) { diff --git a/src/Analyzers/CSharp/Analyzers/NewLines/EmbeddedStatementPlacement/EmbeddedStatementPlacementDiagnosticAnalyzer.cs b/src/Analyzers/CSharp/Analyzers/NewLines/EmbeddedStatementPlacement/EmbeddedStatementPlacementDiagnosticAnalyzer.cs index 830a990ece23d..f8061c1968383 100644 --- a/src/Analyzers/CSharp/Analyzers/NewLines/EmbeddedStatementPlacement/EmbeddedStatementPlacementDiagnosticAnalyzer.cs +++ b/src/Analyzers/CSharp/Analyzers/NewLines/EmbeddedStatementPlacement/EmbeddedStatementPlacementDiagnosticAnalyzer.cs @@ -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))) { diff --git a/src/Analyzers/CSharp/Analyzers/OrderModifiers/CSharpOrderModifiersDiagnosticAnalyzer.cs b/src/Analyzers/CSharp/Analyzers/OrderModifiers/CSharpOrderModifiersDiagnosticAnalyzer.cs index 84d285e5bdda7..821386a169cad 100644 --- a/src/Analyzers/CSharp/Analyzers/OrderModifiers/CSharpOrderModifiersDiagnosticAnalyzer.cs +++ b/src/Analyzers/CSharp/Analyzers/OrderModifiers/CSharpOrderModifiersDiagnosticAnalyzer.cs @@ -19,8 +19,7 @@ internal class CSharpOrderModifiersDiagnosticAnalyzer : AbstractOrderModifiersDi public CSharpOrderModifiersDiagnosticAnalyzer() : base(CSharpSyntaxFacts.Instance, CSharpCodeStyleOptions.PreferredModifierOrder, - CSharpOrderModifiersHelper.Instance, - LanguageNames.CSharp) + CSharpOrderModifiersHelper.Instance) { } diff --git a/src/Analyzers/CSharp/Analyzers/RemoveUnnecessaryLambdaExpression/CSharpRemoveUnnecessaryLambdaExpressionDiagnosticAnalyzer.cs b/src/Analyzers/CSharp/Analyzers/RemoveUnnecessaryLambdaExpression/CSharpRemoveUnnecessaryLambdaExpressionDiagnosticAnalyzer.cs index ffacaff087881..89f073ea03d26 100644 --- a/src/Analyzers/CSharp/Analyzers/RemoveUnnecessaryLambdaExpression/CSharpRemoveUnnecessaryLambdaExpressionDiagnosticAnalyzer.cs +++ b/src/Analyzers/CSharp/Analyzers/RemoveUnnecessaryLambdaExpression/CSharpRemoveUnnecessaryLambdaExpressionDiagnosticAnalyzer.cs @@ -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))) { diff --git a/src/Analyzers/CSharp/Analyzers/RemoveUnusedParametersAndValues/CSharpRemoveUnusedParametersAndValuesDiagnosticAnalyzer.cs b/src/Analyzers/CSharp/Analyzers/RemoveUnusedParametersAndValues/CSharpRemoveUnusedParametersAndValuesDiagnosticAnalyzer.cs index 49aa7b1def4c5..c0293dbcc73af 100644 --- a/src/Analyzers/CSharp/Analyzers/RemoveUnusedParametersAndValues/CSharpRemoveUnusedParametersAndValuesDiagnosticAnalyzer.cs +++ b/src/Analyzers/CSharp/Analyzers/RemoveUnusedParametersAndValues/CSharpRemoveUnusedParametersAndValuesDiagnosticAnalyzer.cs @@ -17,8 +17,7 @@ internal sealed class CSharpRemoveUnusedParametersAndValuesDiagnosticAnalyzer : { public CSharpRemoveUnusedParametersAndValuesDiagnosticAnalyzer() : base(unusedValueExpressionStatementOption: CSharpCodeStyleOptions.UnusedValueExpressionStatement, - unusedValueAssignmentOption: CSharpCodeStyleOptions.UnusedValueAssignment, - LanguageNames.CSharp) + unusedValueAssignmentOption: CSharpCodeStyleOptions.UnusedValueAssignment) { } diff --git a/src/Analyzers/CSharp/Analyzers/SimplifyPropertyPattern/CSharpSimplifyPropertyPatternDiagnosticAnalyzer.cs b/src/Analyzers/CSharp/Analyzers/SimplifyPropertyPattern/CSharpSimplifyPropertyPatternDiagnosticAnalyzer.cs index 7259fff8ccd45..272c0ae091462 100644 --- a/src/Analyzers/CSharp/Analyzers/SimplifyPropertyPattern/CSharpSimplifyPropertyPatternDiagnosticAnalyzer.cs +++ b/src/Analyzers/CSharp/Analyzers/SimplifyPropertyPattern/CSharpSimplifyPropertyPatternDiagnosticAnalyzer.cs @@ -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))) { diff --git a/src/Analyzers/CSharp/Analyzers/UseDeconstruction/CSharpUseDeconstructionDiagnosticAnalyzer.cs b/src/Analyzers/CSharp/Analyzers/UseDeconstruction/CSharpUseDeconstructionDiagnosticAnalyzer.cs index d91b1fa484072..46fa47e83b80a 100644 --- a/src/Analyzers/CSharp/Analyzers/UseDeconstruction/CSharpUseDeconstructionDiagnosticAnalyzer.cs +++ b/src/Analyzers/CSharp/Analyzers/UseDeconstruction/CSharpUseDeconstructionDiagnosticAnalyzer.cs @@ -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))) { diff --git a/src/Analyzers/CSharp/Analyzers/UseDefaultLiteral/CSharpUseDefaultLiteralDiagnosticAnalyzer.cs b/src/Analyzers/CSharp/Analyzers/UseDefaultLiteral/CSharpUseDefaultLiteralDiagnosticAnalyzer.cs index 37a0d6057af3c..4cdbcf6747942 100644 --- a/src/Analyzers/CSharp/Analyzers/UseDefaultLiteral/CSharpUseDefaultLiteralDiagnosticAnalyzer.cs +++ b/src/Analyzers/CSharp/Analyzers/UseDefaultLiteral/CSharpUseDefaultLiteralDiagnosticAnalyzer.cs @@ -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))) { diff --git a/src/Analyzers/CSharp/Analyzers/UseExpressionBody/UseExpressionBodyDiagnosticAnalyzer.cs b/src/Analyzers/CSharp/Analyzers/UseExpressionBody/UseExpressionBodyDiagnosticAnalyzer.cs index 8f4ae4a685f12..432718d6d8273 100644 --- a/src/Analyzers/CSharp/Analyzers/UseExpressionBody/UseExpressionBodyDiagnosticAnalyzer.cs +++ b/src/Analyzers/CSharp/Analyzers/UseExpressionBody/UseExpressionBodyDiagnosticAnalyzer.cs @@ -27,14 +27,14 @@ internal class UseExpressionBodyDiagnosticAnalyzer : AbstractBuiltInCodeStyleDia private static readonly ImmutableArray _helpers = UseExpressionBodyHelper.Helpers; public UseExpressionBodyDiagnosticAnalyzer() - : base(GetSupportedDescriptorsWithOptions(), LanguageNames.CSharp) + : base(GetSupportedDescriptorsWithOptions()) { _syntaxKinds = _helpers.SelectMany(h => h.SyntaxKinds).ToImmutableArray(); } - private static ImmutableDictionary GetSupportedDescriptorsWithOptions() + private static ImmutableDictionary GetSupportedDescriptorsWithOptions() { - var builder = ImmutableDictionary.CreateBuilder(); + var builder = ImmutableDictionary.CreateBuilder(); foreach (var helper in _helpers) { var descriptor = CreateDescriptorWithId(helper.DiagnosticId, helper.EnforceOnBuild, helper.UseExpressionBodyTitle, helper.UseExpressionBodyTitle); diff --git a/src/Analyzers/CSharp/Analyzers/UseImplicitObjectCreation/CSharpUseImplicitObjectCreationDiagnosticAnalyzer.cs b/src/Analyzers/CSharp/Analyzers/UseImplicitObjectCreation/CSharpUseImplicitObjectCreationDiagnosticAnalyzer.cs index a7562d39f6354..e88acc98da2d6 100644 --- a/src/Analyzers/CSharp/Analyzers/UseImplicitObjectCreation/CSharpUseImplicitObjectCreationDiagnosticAnalyzer.cs +++ b/src/Analyzers/CSharp/Analyzers/UseImplicitObjectCreation/CSharpUseImplicitObjectCreationDiagnosticAnalyzer.cs @@ -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))) { diff --git a/src/Analyzers/CSharp/Analyzers/UseImplicitOrExplicitType/CSharpTypeStyleDiagnosticAnalyzerBase.cs b/src/Analyzers/CSharp/Analyzers/UseImplicitOrExplicitType/CSharpTypeStyleDiagnosticAnalyzerBase.cs index 14156c8be665a..bd5496edf7820 100644 --- a/src/Analyzers/CSharp/Analyzers/UseImplicitOrExplicitType/CSharpTypeStyleDiagnosticAnalyzerBase.cs +++ b/src/Analyzers/CSharp/Analyzers/UseImplicitOrExplicitType/CSharpTypeStyleDiagnosticAnalyzerBase.cs @@ -29,8 +29,7 @@ protected CSharpTypeStyleDiagnosticAnalyzerBase( string diagnosticId, EnforceOnBuild enforceOnBuild, LocalizableString title, LocalizableString message) : base(diagnosticId, enforceOnBuild, - ImmutableHashSet.Create(CSharpCodeStyleOptions.VarForBuiltInTypes, CSharpCodeStyleOptions.VarWhenTypeIsApparent, CSharpCodeStyleOptions.VarElsewhere), - LanguageNames.CSharp, + ImmutableHashSet.Create(CSharpCodeStyleOptions.VarForBuiltInTypes, CSharpCodeStyleOptions.VarWhenTypeIsApparent, CSharpCodeStyleOptions.VarElsewhere), title, message) { } diff --git a/src/Analyzers/CSharp/Analyzers/UseIndexOrRangeOperator/CSharpUseIndexOperatorDiagnosticAnalyzer.cs b/src/Analyzers/CSharp/Analyzers/UseIndexOrRangeOperator/CSharpUseIndexOperatorDiagnosticAnalyzer.cs index 370ab9d158fd8..40f838bc29170 100644 --- a/src/Analyzers/CSharp/Analyzers/UseIndexOrRangeOperator/CSharpUseIndexOperatorDiagnosticAnalyzer.cs +++ b/src/Analyzers/CSharp/Analyzers/UseIndexOrRangeOperator/CSharpUseIndexOperatorDiagnosticAnalyzer.cs @@ -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))) { diff --git a/src/Analyzers/CSharp/Analyzers/UseIndexOrRangeOperator/CSharpUseRangeOperatorDiagnosticAnalyzer.cs b/src/Analyzers/CSharp/Analyzers/UseIndexOrRangeOperator/CSharpUseRangeOperatorDiagnosticAnalyzer.cs index 99d59c8b0719f..87e92f4e4a8c3 100644 --- a/src/Analyzers/CSharp/Analyzers/UseIndexOrRangeOperator/CSharpUseRangeOperatorDiagnosticAnalyzer.cs +++ b/src/Analyzers/CSharp/Analyzers/UseIndexOrRangeOperator/CSharpUseRangeOperatorDiagnosticAnalyzer.cs @@ -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))) { diff --git a/src/Analyzers/CSharp/Analyzers/UseIsNullCheck/CSharpUseIsNullCheckForCastAndEqualityOperatorDiagnosticAnalyzer.cs b/src/Analyzers/CSharp/Analyzers/UseIsNullCheck/CSharpUseIsNullCheckForCastAndEqualityOperatorDiagnosticAnalyzer.cs index 97d8fb93e8a37..7139a5cf4e559 100644 --- a/src/Analyzers/CSharp/Analyzers/UseIsNullCheck/CSharpUseIsNullCheckForCastAndEqualityOperatorDiagnosticAnalyzer.cs +++ b/src/Analyzers/CSharp/Analyzers/UseIsNullCheck/CSharpUseIsNullCheckForCastAndEqualityOperatorDiagnosticAnalyzer.cs @@ -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)), new LocalizableResourceString(nameof(AnalyzersResources.Null_check_can_be_simplified), AnalyzersResources.ResourceManager, typeof(AnalyzersResources))) { } diff --git a/src/Analyzers/CSharp/Analyzers/UseIsNullCheck/CSharpUseNullCheckOverTypeCheckDiagnosticAnalyzer.cs b/src/Analyzers/CSharp/Analyzers/UseIsNullCheck/CSharpUseNullCheckOverTypeCheckDiagnosticAnalyzer.cs index 5ef4c84b979a2..58fba071e48e7 100644 --- a/src/Analyzers/CSharp/Analyzers/UseIsNullCheck/CSharpUseNullCheckOverTypeCheckDiagnosticAnalyzer.cs +++ b/src/Analyzers/CSharp/Analyzers/UseIsNullCheck/CSharpUseNullCheckOverTypeCheckDiagnosticAnalyzer.cs @@ -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))) { diff --git a/src/Analyzers/CSharp/Analyzers/UseLocalFunction/CSharpUseLocalFunctionDiagnosticAnalyzer.cs b/src/Analyzers/CSharp/Analyzers/UseLocalFunction/CSharpUseLocalFunctionDiagnosticAnalyzer.cs index 77435b4a65e3a..73bdc54882c3f 100644 --- a/src/Analyzers/CSharp/Analyzers/UseLocalFunction/CSharpUseLocalFunctionDiagnosticAnalyzer.cs +++ b/src/Analyzers/CSharp/Analyzers/UseLocalFunction/CSharpUseLocalFunctionDiagnosticAnalyzer.cs @@ -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))) { diff --git a/src/Analyzers/CSharp/Analyzers/UsePatternCombinators/CSharpUsePatternCombinatorsDiagnosticAnalyzer.cs b/src/Analyzers/CSharp/Analyzers/UsePatternCombinators/CSharpUsePatternCombinatorsDiagnosticAnalyzer.cs index da07ded9d37f1..84a1f7769fd36 100644 --- a/src/Analyzers/CSharp/Analyzers/UsePatternCombinators/CSharpUsePatternCombinatorsDiagnosticAnalyzer.cs +++ b/src/Analyzers/CSharp/Analyzers/UsePatternCombinators/CSharpUsePatternCombinatorsDiagnosticAnalyzer.cs @@ -35,7 +35,6 @@ public CSharpUsePatternCombinatorsDiagnosticAnalyzer() : base(IDEDiagnosticIds.UsePatternCombinatorsDiagnosticId, EnforceOnBuildValues.UsePatternCombinators, CSharpCodeStyleOptions.PreferPatternMatching, - LanguageNames.CSharp, s_safePatternTitle, s_safePatternTitle) { diff --git a/src/Analyzers/CSharp/Analyzers/UsePatternMatching/CSharpAsAndNullCheckDiagnosticAnalyzer.cs b/src/Analyzers/CSharp/Analyzers/UsePatternMatching/CSharpAsAndNullCheckDiagnosticAnalyzer.cs index 2e7279c53a56e..e9f529062496f 100644 --- a/src/Analyzers/CSharp/Analyzers/UsePatternMatching/CSharpAsAndNullCheckDiagnosticAnalyzer.cs +++ b/src/Analyzers/CSharp/Analyzers/UsePatternMatching/CSharpAsAndNullCheckDiagnosticAnalyzer.cs @@ -33,7 +33,6 @@ public CSharpAsAndNullCheckDiagnosticAnalyzer() : base(IDEDiagnosticIds.InlineAsTypeCheckId, EnforceOnBuildValues.InlineAsType, CSharpCodeStyleOptions.PreferPatternMatchingOverAsWithNullCheck, - LanguageNames.CSharp, new LocalizableResourceString( nameof(CSharpAnalyzersResources.Use_pattern_matching), CSharpAnalyzersResources.ResourceManager, typeof(CSharpAnalyzersResources))) { diff --git a/src/Analyzers/CSharp/Analyzers/UsePatternMatching/CSharpIsAndCastCheckDiagnosticAnalyzer.cs b/src/Analyzers/CSharp/Analyzers/UsePatternMatching/CSharpIsAndCastCheckDiagnosticAnalyzer.cs index 58aee7d8e1841..4d5db9a4c586a 100644 --- a/src/Analyzers/CSharp/Analyzers/UsePatternMatching/CSharpIsAndCastCheckDiagnosticAnalyzer.cs +++ b/src/Analyzers/CSharp/Analyzers/UsePatternMatching/CSharpIsAndCastCheckDiagnosticAnalyzer.cs @@ -37,7 +37,6 @@ public CSharpIsAndCastCheckDiagnosticAnalyzer() : base(IDEDiagnosticIds.InlineIsTypeCheckId, EnforceOnBuildValues.InlineIsType, CSharpCodeStyleOptions.PreferPatternMatchingOverIsWithCastCheck, - LanguageNames.CSharp, new LocalizableResourceString( nameof(CSharpAnalyzersResources.Use_pattern_matching), CSharpAnalyzersResources.ResourceManager, typeof(CSharpAnalyzersResources))) { diff --git a/src/Analyzers/CSharp/Analyzers/UsePatternMatching/CSharpUseNotPatternDiagnosticAnalyzer.cs b/src/Analyzers/CSharp/Analyzers/UsePatternMatching/CSharpUseNotPatternDiagnosticAnalyzer.cs index 22eb9b3e6e3f0..3debfffc772a7 100644 --- a/src/Analyzers/CSharp/Analyzers/UsePatternMatching/CSharpUseNotPatternDiagnosticAnalyzer.cs +++ b/src/Analyzers/CSharp/Analyzers/UsePatternMatching/CSharpUseNotPatternDiagnosticAnalyzer.cs @@ -30,7 +30,6 @@ public CSharpUseNotPatternDiagnosticAnalyzer() : base(IDEDiagnosticIds.UseNotPatternDiagnosticId, EnforceOnBuildValues.UseNotPattern, CSharpCodeStyleOptions.PreferNotPattern, - LanguageNames.CSharp, new LocalizableResourceString( nameof(CSharpAnalyzersResources.Use_pattern_matching), CSharpAnalyzersResources.ResourceManager, typeof(CSharpAnalyzersResources))) { diff --git a/src/Analyzers/CSharp/Analyzers/UseSimpleUsingStatement/UseSimpleUsingStatementDiagnosticAnalyzer.cs b/src/Analyzers/CSharp/Analyzers/UseSimpleUsingStatement/UseSimpleUsingStatementDiagnosticAnalyzer.cs index 89e5aae5d166d..7c7c8abdc4cf4 100644 --- a/src/Analyzers/CSharp/Analyzers/UseSimpleUsingStatement/UseSimpleUsingStatementDiagnosticAnalyzer.cs +++ b/src/Analyzers/CSharp/Analyzers/UseSimpleUsingStatement/UseSimpleUsingStatementDiagnosticAnalyzer.cs @@ -53,7 +53,6 @@ public UseSimpleUsingStatementDiagnosticAnalyzer() : base(IDEDiagnosticIds.UseSimpleUsingStatementDiagnosticId, EnforceOnBuildValues.UseSimpleUsingStatement, CSharpCodeStyleOptions.PreferSimpleUsingStatement, - LanguageNames.CSharp, new LocalizableResourceString(nameof(CSharpAnalyzersResources.Use_simple_using_statement), CSharpAnalyzersResources.ResourceManager, typeof(CSharpAnalyzersResources)), new LocalizableResourceString(nameof(CSharpAnalyzersResources.using_statement_can_be_simplified), CSharpAnalyzersResources.ResourceManager, typeof(CSharpAnalyzersResources))) { diff --git a/src/Analyzers/CSharp/Analyzers/UseThrowExpression/CSharpUseThrowExpressionDiagnosticAnalyzer.cs b/src/Analyzers/CSharp/Analyzers/UseThrowExpression/CSharpUseThrowExpressionDiagnosticAnalyzer.cs index eaa426af470dd..ee0c25ab30602 100644 --- a/src/Analyzers/CSharp/Analyzers/UseThrowExpression/CSharpUseThrowExpressionDiagnosticAnalyzer.cs +++ b/src/Analyzers/CSharp/Analyzers/UseThrowExpression/CSharpUseThrowExpressionDiagnosticAnalyzer.cs @@ -17,7 +17,7 @@ namespace Microsoft.CodeAnalysis.CSharp.UseThrowExpression internal class CSharpUseThrowExpressionDiagnosticAnalyzer : AbstractUseThrowExpressionDiagnosticAnalyzer { public CSharpUseThrowExpressionDiagnosticAnalyzer() - : base(CSharpCodeStyleOptions.PreferThrowExpression, LanguageNames.CSharp) + : base(CSharpCodeStyleOptions.PreferThrowExpression) { } diff --git a/src/Analyzers/CSharp/Analyzers/UseTupleSwap/CSharpUseTupleSwapDiagnosticAnalyzer.cs b/src/Analyzers/CSharp/Analyzers/UseTupleSwap/CSharpUseTupleSwapDiagnosticAnalyzer.cs index cc27ffb5ac1dc..810ecb2391dc8 100644 --- a/src/Analyzers/CSharp/Analyzers/UseTupleSwap/CSharpUseTupleSwapDiagnosticAnalyzer.cs +++ b/src/Analyzers/CSharp/Analyzers/UseTupleSwap/CSharpUseTupleSwapDiagnosticAnalyzer.cs @@ -35,7 +35,6 @@ public CSharpUseTupleSwapDiagnosticAnalyzer() : base(IDEDiagnosticIds.UseTupleSwapDiagnosticId, EnforceOnBuildValues.UseTupleSwap, CSharpCodeStyleOptions.PreferTupleSwap, - LanguageNames.CSharp, new LocalizableResourceString( nameof(CSharpAnalyzersResources.Use_tuple_to_swap_values), CSharpAnalyzersResources.ResourceManager, typeof(CSharpAnalyzersResources))) { diff --git a/src/Analyzers/CSharp/Analyzers/UseUtf8StringLiteral/UseUtf8StringLiteralDiagnosticAnalyzer.cs b/src/Analyzers/CSharp/Analyzers/UseUtf8StringLiteral/UseUtf8StringLiteralDiagnosticAnalyzer.cs index a0cbfc5874d40..451f31a28fd1e 100644 --- a/src/Analyzers/CSharp/Analyzers/UseUtf8StringLiteral/UseUtf8StringLiteralDiagnosticAnalyzer.cs +++ b/src/Analyzers/CSharp/Analyzers/UseUtf8StringLiteral/UseUtf8StringLiteralDiagnosticAnalyzer.cs @@ -36,7 +36,6 @@ public UseUtf8StringLiteralDiagnosticAnalyzer() : base(IDEDiagnosticIds.UseUtf8StringLiteralDiagnosticId, EnforceOnBuildValues.UseUtf8StringLiteral, CSharpCodeStyleOptions.PreferUtf8StringLiterals, - LanguageNames.CSharp, new LocalizableResourceString(nameof(CSharpAnalyzersResources.Use_Utf8_string_literal), CSharpAnalyzersResources.ResourceManager, typeof(CSharpAnalyzersResources))) { } diff --git a/src/Analyzers/Core/Analyzers/AbstractBuiltInCodeStyleDiagnosticAnalyzer.cs b/src/Analyzers/Core/Analyzers/AbstractBuiltInCodeStyleDiagnosticAnalyzer.cs index be4a0cfba4989..2cf6c900b36f8 100644 --- a/src/Analyzers/Core/Analyzers/AbstractBuiltInCodeStyleDiagnosticAnalyzer.cs +++ b/src/Analyzers/Core/Analyzers/AbstractBuiltInCodeStyleDiagnosticAnalyzer.cs @@ -15,53 +15,20 @@ using OptionSet = Microsoft.CodeAnalysis.Diagnostics.AnalyzerConfigOptions; #endif -#pragma warning disable IDE0060 // Remove unused parameter - TODO: Will follow-up and remove language parameters. - namespace Microsoft.CodeAnalysis.CodeStyle { internal abstract partial class AbstractBuiltInCodeStyleDiagnosticAnalyzer { /// /// Constructor for a code style analyzer with a single diagnostic descriptor and - /// unique code style option. - /// - /// Diagnostic ID reported by this analyzer - /// Build enforcement recommendation for this analyzer - /// - /// Per-language option that can be used to configure the given . - /// , if there is no such unique option. - /// - /// Title for the diagnostic descriptor - /// - /// Message for the diagnostic descriptor. - /// if the message is identical to the title. - /// - /// if the diagnostic is reported on unnecessary code; otherwise, . - /// Flag indicating if the reported diagnostics are configurable by the end users - protected AbstractBuiltInCodeStyleDiagnosticAnalyzer( - string diagnosticId, - EnforceOnBuild enforceOnBuild, - IPerLanguageValuedOption? option, - LocalizableString title, - LocalizableString? messageFormat = null, - bool isUnnecessary = false, - bool configurable = true) - : this(diagnosticId, enforceOnBuild, title, messageFormat, isUnnecessary, configurable) - { - AddDiagnosticIdToOptionMapping(diagnosticId, option); - } - - /// - /// Constructor for a code style analyzer with a single diagnostic descriptor and - /// unique code style option for the given language. + /// unique code style option. /// /// Diagnostic ID reported by this analyzer /// Build enforcement recommendation for this analyzer /// - /// Language specific option that can be used to configure the given . + /// Code style option that can be used to configure the given . /// , if there is no such unique option. /// - /// Language for the given language-specific . /// Title for the diagnostic descriptor /// /// Message for the diagnostic descriptor. @@ -72,8 +39,7 @@ protected AbstractBuiltInCodeStyleDiagnosticAnalyzer( protected AbstractBuiltInCodeStyleDiagnosticAnalyzer( string diagnosticId, EnforceOnBuild enforceOnBuild, - ISingleValuedOption? option, - string language, + IOption2? option, LocalizableString title, LocalizableString? messageFormat = null, bool isUnnecessary = false, @@ -85,12 +51,12 @@ protected AbstractBuiltInCodeStyleDiagnosticAnalyzer( /// /// Constructor for a code style analyzer with a single diagnostic descriptor and - /// two or more code style options. + /// two or more code style options. /// /// Diagnostic ID reported by this analyzer /// Build enforcement recommendation for this analyzer /// - /// Set of two or more per-language options that can be used to configure the diagnostic severity of the given diagnosticId. + /// Set of two or more code style options that can be used to configure the diagnostic severity of the given diagnosticId. /// /// Title for the diagnostic descriptor /// @@ -102,7 +68,7 @@ protected AbstractBuiltInCodeStyleDiagnosticAnalyzer( protected AbstractBuiltInCodeStyleDiagnosticAnalyzer( string diagnosticId, EnforceOnBuild enforceOnBuild, - ImmutableHashSet options, + ImmutableHashSet options, LocalizableString title, LocalizableString? messageFormat = null, bool isUnnecessary = false, @@ -115,85 +81,16 @@ protected AbstractBuiltInCodeStyleDiagnosticAnalyzer( } /// - /// Constructor for a code style analyzer with a single diagnostic descriptor and - /// two or more code style options for the given language. + /// Constructor for a code style analyzer with a multiple diagnostic descriptors with a code style options that can be used to configure each descriptor. /// - /// Diagnostic ID reported by this analyzer - /// Build enforcement recommendation for this analyzer - /// - /// Set of two or more language-specific options that can be used to configure the diagnostic severity of the given diagnosticId. - /// - /// Language for the given language-specific . - /// Title for the diagnostic descriptor - /// - /// Message for the diagnostic descriptor. - /// Null if the message is identical to the title. - /// - /// if the diagnostic is reported on unnecessary code; otherwise, . - /// Flag indicating if the reported diagnostics are configurable by the end users - protected AbstractBuiltInCodeStyleDiagnosticAnalyzer( - string diagnosticId, - EnforceOnBuild enforceOnBuild, - ImmutableHashSet options, - string language, - LocalizableString title, - LocalizableString? messageFormat = null, - bool isUnnecessary = false, - bool configurable = true) - : this(diagnosticId, enforceOnBuild, title, messageFormat, isUnnecessary, configurable) - { - RoslynDebug.Assert(options != null); - Debug.Assert(options.Count > 1); - AddDiagnosticIdToOptionMapping(diagnosticId, options); - } - - /// - /// Constructor for a code style analyzer with a multiple diagnostic descriptors with per-language options that can be used to configure each descriptor. - /// - protected AbstractBuiltInCodeStyleDiagnosticAnalyzer(ImmutableDictionary supportedDiagnosticsWithOptions) + protected AbstractBuiltInCodeStyleDiagnosticAnalyzer(ImmutableDictionary supportedDiagnosticsWithOptions) : this(supportedDiagnosticsWithOptions.Keys.ToImmutableArray()) { foreach (var (descriptor, option) in supportedDiagnosticsWithOptions) AddDiagnosticIdToOptionMapping(descriptor.Id, option); } - /// - /// Constructor for a code style analyzer with a multiple diagnostic descriptors with language-specific options that can be used to configure each descriptor. - /// - protected AbstractBuiltInCodeStyleDiagnosticAnalyzer( - ImmutableDictionary supportedDiagnosticsWithOptions, - string language) - : this(supportedDiagnosticsWithOptions.Keys.ToImmutableArray()) - { - foreach (var (descriptor, option) in supportedDiagnosticsWithOptions) - AddDiagnosticIdToOptionMapping(descriptor.Id, option); - } - - /// - /// Constructor for a code style analyzer with a multiple diagnostic descriptors with a mix of language-specific and per-language options that can be used to configure each descriptor. - /// - protected AbstractBuiltInCodeStyleDiagnosticAnalyzer( - ImmutableDictionary supportedDiagnosticsWithLangaugeSpecificOptions, - ImmutableDictionary supportedDiagnosticsWithPerLanguageOptions, - string language) - : this(supportedDiagnosticsWithLangaugeSpecificOptions.Keys.Concat(supportedDiagnosticsWithPerLanguageOptions.Keys).ToImmutableArray()) - { - foreach (var (descriptor, option) in supportedDiagnosticsWithLangaugeSpecificOptions) - AddDiagnosticIdToOptionMapping(descriptor.Id, option); - - foreach (var (descriptor, option) in supportedDiagnosticsWithPerLanguageOptions) - AddDiagnosticIdToOptionMapping(descriptor.Id, option); - } - - private static void AddDiagnosticIdToOptionMapping(string diagnosticId, IPerLanguageValuedOption? option) - { - if (option != null) - { - AddDiagnosticIdToOptionMapping(diagnosticId, ImmutableHashSet.Create(option)); - } - } - - private static void AddDiagnosticIdToOptionMapping(string diagnosticId, ISingleValuedOption? option) + private static void AddDiagnosticIdToOptionMapping(string diagnosticId, IOption2? option) { if (option != null) { @@ -201,10 +98,7 @@ private static void AddDiagnosticIdToOptionMapping(string diagnosticId, ISingleV } } - private static void AddDiagnosticIdToOptionMapping(string diagnosticId, ImmutableHashSet options) - => IDEDiagnosticIdToOptionMappingHelper.AddOptionMapping(diagnosticId, options); - - private static void AddDiagnosticIdToOptionMapping(string diagnosticId, ImmutableHashSet options) + private static void AddDiagnosticIdToOptionMapping(string diagnosticId, ImmutableHashSet options) => IDEDiagnosticIdToOptionMappingHelper.AddOptionMapping(diagnosticId, options); public abstract DiagnosticAnalyzerCategory GetAnalyzerCategory(); diff --git a/src/Analyzers/Core/Analyzers/AbstractBuiltInUnnecessaryCodeStyleDiagnosticAnalyzer.cs b/src/Analyzers/Core/Analyzers/AbstractBuiltInUnnecessaryCodeStyleDiagnosticAnalyzer.cs index c141933c6c8ed..0c241467397bf 100644 --- a/src/Analyzers/Core/Analyzers/AbstractBuiltInUnnecessaryCodeStyleDiagnosticAnalyzer.cs +++ b/src/Analyzers/Core/Analyzers/AbstractBuiltInUnnecessaryCodeStyleDiagnosticAnalyzer.cs @@ -24,7 +24,7 @@ internal abstract class AbstractBuiltInUnnecessaryCodeStyleDiagnosticAnalyzer : /// Diagnostic ID reported by this analyzer /// Build enforcement recommendation for this analyzer /// - /// Per-language option that can be used to configure the given . + /// Code style option that can be used to configure the given . /// , if there is no such unique option. /// /// @@ -40,7 +40,7 @@ internal abstract class AbstractBuiltInUnnecessaryCodeStyleDiagnosticAnalyzer : protected AbstractBuiltInUnnecessaryCodeStyleDiagnosticAnalyzer( string diagnosticId, EnforceOnBuild enforceOnBuild, - IPerLanguageValuedOption? option, + IOption2? option, PerLanguageOption2? fadingOption, LocalizableString title, LocalizableString? messageFormat = null, @@ -50,41 +50,6 @@ protected AbstractBuiltInUnnecessaryCodeStyleDiagnosticAnalyzer( AddDiagnosticIdToFadingOptionMapping(diagnosticId, fadingOption); } - /// - /// Constructor for an unnecessary code style analyzer with a single diagnostic descriptor and - /// unique code style option for the given language. - /// - /// Diagnostic ID reported by this analyzer - /// Build enforcement recommendation for this analyzer - /// - /// Language specific option that can be used to configure the given . - /// , if there is no such unique option. - /// - /// - /// Per-language fading option that can be used to configure if the diagnostic should be faded in the IDE or not. - /// , if there is no such unique fading option. - /// - /// Language for the given language-specific . - /// Title for the diagnostic descriptor - /// - /// Message for the diagnostic descriptor. - /// if the message is identical to the title. - /// - /// Flag indicating if the reported diagnostics are configurable by the end users - protected AbstractBuiltInUnnecessaryCodeStyleDiagnosticAnalyzer( - string diagnosticId, - EnforceOnBuild enforceOnBuild, - ISingleValuedOption? option, - PerLanguageOption2? fadingOption, - string language, - LocalizableString title, - LocalizableString? messageFormat = null, - bool configurable = true) - : base(diagnosticId, enforceOnBuild, option, language, title, messageFormat, isUnnecessary: true, configurable) - { - AddDiagnosticIdToFadingOptionMapping(diagnosticId, fadingOption); - } - /// /// Constructor for an unnecessary code style analyzer with a single diagnostic descriptor and /// two or more code style options. @@ -107,7 +72,7 @@ protected AbstractBuiltInUnnecessaryCodeStyleDiagnosticAnalyzer( protected AbstractBuiltInUnnecessaryCodeStyleDiagnosticAnalyzer( string diagnosticId, EnforceOnBuild enforceOnBuild, - ImmutableHashSet options, + ImmutableHashSet options, PerLanguageOption2? fadingOption, LocalizableString title, LocalizableString? messageFormat = null, diff --git a/src/Analyzers/Core/Analyzers/AbstractParenthesesDiagnosticAnalyzer.cs b/src/Analyzers/Core/Analyzers/AbstractParenthesesDiagnosticAnalyzer.cs index a58ce1df7bcd7..d0dd0d4d2ea0e 100644 --- a/src/Analyzers/Core/Analyzers/AbstractParenthesesDiagnosticAnalyzer.cs +++ b/src/Analyzers/Core/Analyzers/AbstractParenthesesDiagnosticAnalyzer.cs @@ -17,7 +17,7 @@ protected AbstractParenthesesDiagnosticAnalyzer( string descriptorId, EnforceOnBuild enforceOnBuild, LocalizableString title, LocalizableString message, bool isUnnecessary = false) : base(descriptorId, enforceOnBuild, - options: ImmutableHashSet.Create(CodeStyleOptions2.ArithmeticBinaryParentheses, CodeStyleOptions2.RelationalBinaryParentheses, CodeStyleOptions2.OtherBinaryParentheses, CodeStyleOptions2.OtherParentheses), + options: ImmutableHashSet.Create(CodeStyleOptions2.ArithmeticBinaryParentheses, CodeStyleOptions2.RelationalBinaryParentheses, CodeStyleOptions2.OtherBinaryParentheses, CodeStyleOptions2.OtherParentheses), title, message, isUnnecessary: isUnnecessary) diff --git a/src/Analyzers/Core/Analyzers/ConvertTypeofToNameof/AbstractConvertTypeOfToNameOfDiagnosticAnalyzer.cs b/src/Analyzers/Core/Analyzers/ConvertTypeofToNameof/AbstractConvertTypeOfToNameOfDiagnosticAnalyzer.cs index 7a35d56bebdf5..92b3f8bba97e1 100644 --- a/src/Analyzers/Core/Analyzers/ConvertTypeofToNameof/AbstractConvertTypeOfToNameOfDiagnosticAnalyzer.cs +++ b/src/Analyzers/Core/Analyzers/ConvertTypeofToNameof/AbstractConvertTypeOfToNameOfDiagnosticAnalyzer.cs @@ -14,11 +14,10 @@ namespace Microsoft.CodeAnalysis.ConvertTypeOfToNameOf { internal abstract class AbstractConvertTypeOfToNameOfDiagnosticAnalyzer : AbstractBuiltInCodeStyleDiagnosticAnalyzer { - protected AbstractConvertTypeOfToNameOfDiagnosticAnalyzer(LocalizableString title, string language) + protected AbstractConvertTypeOfToNameOfDiagnosticAnalyzer(LocalizableString title) : base(diagnosticId: IDEDiagnosticIds.ConvertTypeOfToNameOfDiagnosticId, EnforceOnBuildValues.ConvertTypeOfToNameOf, option: null, - language: language, title: title) { } diff --git a/src/Analyzers/Core/Analyzers/FileHeaders/AbstractFileHeaderDiagnosticAnalyzer.cs b/src/Analyzers/Core/Analyzers/FileHeaders/AbstractFileHeaderDiagnosticAnalyzer.cs index 1d7c7d552a04b..96d4a18f779fe 100644 --- a/src/Analyzers/Core/Analyzers/FileHeaders/AbstractFileHeaderDiagnosticAnalyzer.cs +++ b/src/Analyzers/Core/Analyzers/FileHeaders/AbstractFileHeaderDiagnosticAnalyzer.cs @@ -23,11 +23,10 @@ internal abstract class AbstractFileHeaderDiagnosticAnalyzer : AbstractBuiltInCo private static DiagnosticDescriptor CreateDescriptorForFileHeader(LocalizableString title, LocalizableString message) => CreateDescriptorWithId(IDEDiagnosticIds.FileHeaderMismatch, EnforceOnBuildValues.FileHeaderMismatch, title, message); - protected AbstractFileHeaderDiagnosticAnalyzer(string language) - : base(ImmutableDictionary.Empty + protected AbstractFileHeaderDiagnosticAnalyzer() + : base(ImmutableDictionary.Empty .Add(s_invalidHeaderDescriptor, CodeStyleOptions2.FileHeaderTemplate) - .Add(s_missingHeaderDescriptor, CodeStyleOptions2.FileHeaderTemplate), - language) + .Add(s_missingHeaderDescriptor, CodeStyleOptions2.FileHeaderTemplate)) { } diff --git a/src/Analyzers/Core/Analyzers/ForEachCast/AbstractForEachCastDiagnosticAnalyzer.cs b/src/Analyzers/Core/Analyzers/ForEachCast/AbstractForEachCastDiagnosticAnalyzer.cs index 552f981cb8423..082f3d5c62975 100644 --- a/src/Analyzers/Core/Analyzers/ForEachCast/AbstractForEachCastDiagnosticAnalyzer.cs +++ b/src/Analyzers/Core/Analyzers/ForEachCast/AbstractForEachCastDiagnosticAnalyzer.cs @@ -31,7 +31,6 @@ protected AbstractForEachCastDiagnosticAnalyzer() diagnosticId: IDEDiagnosticIds.ForEachCastDiagnosticId, EnforceOnBuildValues.ForEachCast, CodeStyleOptions2.ForEachExplicitCastInSource, - language: null!, title: new LocalizableResourceString(nameof(AnalyzersResources.Add_explicit_cast), AnalyzersResources.ResourceManager, typeof(AnalyzersResources)), messageFormat: new LocalizableResourceString(nameof(AnalyzersResources._0_statement_implicitly_converts_1_to_2_Add_an_explicit_cast_to_make_intent_clearer_as_it_may_fail_at_runtime), AnalyzersResources.ResourceManager, typeof(AnalyzersResources))) { diff --git a/src/Analyzers/Core/Analyzers/IDEDiagnosticIdToOptionMappingHelper.cs b/src/Analyzers/Core/Analyzers/IDEDiagnosticIdToOptionMappingHelper.cs index 760152a783477..35ef514e28dc5 100644 --- a/src/Analyzers/Core/Analyzers/IDEDiagnosticIdToOptionMappingHelper.cs +++ b/src/Analyzers/Core/Analyzers/IDEDiagnosticIdToOptionMappingHelper.cs @@ -4,6 +4,7 @@ using System; using System.Collections.Concurrent; +using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; using System.Diagnostics.CodeAnalysis; @@ -35,32 +36,48 @@ public static bool IsKnownIDEDiagnosticId(string diagnosticId) => s_diagnosticIdToOptionMap.ContainsKey(diagnosticId) || s_diagnosticIdToLanguageSpecificOptionsMap.Values.Any(map => map.ContainsKey(diagnosticId)); - public static void AddOptionMapping(string diagnosticId, ImmutableHashSet perLanguageOptions) + public static void AddOptionMapping(string diagnosticId, ImmutableHashSet options) { diagnosticId = diagnosticId ?? throw new ArgumentNullException(nameof(diagnosticId)); - perLanguageOptions = perLanguageOptions ?? throw new ArgumentNullException(nameof(perLanguageOptions)); + options = options ?? throw new ArgumentNullException(nameof(options)); - var options = perLanguageOptions.Cast().ToImmutableHashSet(); - AddOptionMapping(s_diagnosticIdToOptionMap, diagnosticId, options); - } - - public static void AddOptionMapping(string diagnosticId, ImmutableHashSet languageSpecificOptions) - { - diagnosticId = diagnosticId ?? throw new ArgumentNullException(nameof(diagnosticId)); - languageSpecificOptions = languageSpecificOptions ?? throw new ArgumentNullException(nameof(languageSpecificOptions)); - - var groups = languageSpecificOptions.GroupBy(o => o.LanguageName); + var groups = options.GroupBy(o => o.IsPerLanguage); + var multipleLanguagesOptionsBuilder = ImmutableHashSet.CreateBuilder(); foreach (var group in groups) { - var language = group.Key; - var map = language switch + if (group.Key == true) { - null => s_diagnosticIdToOptionMap, - _ => s_diagnosticIdToLanguageSpecificOptionsMap.GetOrAdd(language, _ => new ConcurrentDictionary>()) - }; + foreach (var perLanguageValuedOption in group) + { + Debug.Assert(perLanguageValuedOption is IPerLanguageValuedOption); + multipleLanguagesOptionsBuilder.Add(perLanguageValuedOption); + } + } + else + { + var languageGroups = group.GroupBy(o => ((ISingleValuedOption)o).LanguageName); + foreach (var languageGroup in languageGroups) + { + var language = languageGroup.Key; + if (language is null) + { + foreach (var option in languageGroup) + { + multipleLanguagesOptionsBuilder.Add(option); + } + } + else + { + var map = s_diagnosticIdToLanguageSpecificOptionsMap.GetOrAdd(language, _ => new ConcurrentDictionary>()); + AddOptionMapping(map, diagnosticId, languageGroup.ToImmutableHashSet()); + } + } + } + } - var options = group.Cast().ToImmutableHashSet(); - AddOptionMapping(map, diagnosticId, options); + if (multipleLanguagesOptionsBuilder.Count > 0) + { + AddOptionMapping(s_diagnosticIdToOptionMap, diagnosticId, multipleLanguagesOptionsBuilder.ToImmutableHashSet()); } } diff --git a/src/Analyzers/Core/Analyzers/NewLines/ConsecutiveStatementPlacement/AbstractConsecutiveStatementPlacementDiagnosticAnalyzer.cs b/src/Analyzers/Core/Analyzers/NewLines/ConsecutiveStatementPlacement/AbstractConsecutiveStatementPlacementDiagnosticAnalyzer.cs index b1495b0f7d8bd..c5ceb7cdeafcd 100644 --- a/src/Analyzers/Core/Analyzers/NewLines/ConsecutiveStatementPlacement/AbstractConsecutiveStatementPlacementDiagnosticAnalyzer.cs +++ b/src/Analyzers/Core/Analyzers/NewLines/ConsecutiveStatementPlacement/AbstractConsecutiveStatementPlacementDiagnosticAnalyzer.cs @@ -21,7 +21,6 @@ protected AbstractConsecutiveStatementPlacementDiagnosticAnalyzer(ISyntaxFacts s : base(IDEDiagnosticIds.ConsecutiveStatementPlacementDiagnosticId, EnforceOnBuildValues.ConsecutiveStatementPlacement, CodeStyleOptions2.AllowStatementImmediatelyAfterBlock, - LanguageNames.CSharp, new LocalizableResourceString( nameof(AnalyzersResources.Blank_line_required_between_block_and_subsequent_statement), AnalyzersResources.ResourceManager, typeof(AnalyzersResources))) { diff --git a/src/Analyzers/Core/Analyzers/NewLines/MultipleBlankLines/AbstractMultipleBlankLinesDiagnosticAnalyzer.cs b/src/Analyzers/Core/Analyzers/NewLines/MultipleBlankLines/AbstractMultipleBlankLinesDiagnosticAnalyzer.cs index aa547ccba89ad..ce426fe4fda3d 100644 --- a/src/Analyzers/Core/Analyzers/NewLines/MultipleBlankLines/AbstractMultipleBlankLinesDiagnosticAnalyzer.cs +++ b/src/Analyzers/Core/Analyzers/NewLines/MultipleBlankLines/AbstractMultipleBlankLinesDiagnosticAnalyzer.cs @@ -20,7 +20,6 @@ protected AbstractMultipleBlankLinesDiagnosticAnalyzer(ISyntaxFacts syntaxFacts) : base(IDEDiagnosticIds.MultipleBlankLinesDiagnosticId, EnforceOnBuildValues.MultipleBlankLines, CodeStyleOptions2.AllowMultipleBlankLines, - LanguageNames.CSharp, new LocalizableResourceString( nameof(AnalyzersResources.Avoid_multiple_blank_lines), AnalyzersResources.ResourceManager, typeof(AnalyzersResources))) { diff --git a/src/Analyzers/Core/Analyzers/OrderModifiers/AbstractOrderModifiersDiagnosticAnalyzer.cs b/src/Analyzers/Core/Analyzers/OrderModifiers/AbstractOrderModifiersDiagnosticAnalyzer.cs index 5dcbe9d0a1746..8508128b3705f 100644 --- a/src/Analyzers/Core/Analyzers/OrderModifiers/AbstractOrderModifiersDiagnosticAnalyzer.cs +++ b/src/Analyzers/Core/Analyzers/OrderModifiers/AbstractOrderModifiersDiagnosticAnalyzer.cs @@ -19,12 +19,10 @@ internal abstract class AbstractOrderModifiersDiagnosticAnalyzer : AbstractBuilt protected AbstractOrderModifiersDiagnosticAnalyzer( ISyntaxFacts syntaxFacts, Option2> option, - AbstractOrderModifiersHelpers helpers, - string language) + AbstractOrderModifiersHelpers helpers) : base(IDEDiagnosticIds.OrderModifiersDiagnosticId, EnforceOnBuildValues.OrderModifiers, option, - language, new LocalizableResourceString(nameof(AnalyzersResources.Order_modifiers), AnalyzersResources.ResourceManager, typeof(AnalyzersResources)), new LocalizableResourceString(nameof(AnalyzersResources.Modifiers_are_not_ordered), AnalyzersResources.ResourceManager, typeof(AnalyzersResources))) { diff --git a/src/Analyzers/Core/Analyzers/QualifyMemberAccess/AbstractQualifyMemberAccessDiagnosticAnalyzer.cs b/src/Analyzers/Core/Analyzers/QualifyMemberAccess/AbstractQualifyMemberAccessDiagnosticAnalyzer.cs index a0dcf1cfcb8ea..468a27cfd1970 100644 --- a/src/Analyzers/Core/Analyzers/QualifyMemberAccess/AbstractQualifyMemberAccessDiagnosticAnalyzer.cs +++ b/src/Analyzers/Core/Analyzers/QualifyMemberAccess/AbstractQualifyMemberAccessDiagnosticAnalyzer.cs @@ -24,7 +24,7 @@ internal abstract class AbstractQualifyMemberAccessDiagnosticAnalyzer< protected AbstractQualifyMemberAccessDiagnosticAnalyzer() : base(IDEDiagnosticIds.AddThisOrMeQualificationDiagnosticId, EnforceOnBuildValues.AddQualification, - options: ImmutableHashSet.Create(CodeStyleOptions2.QualifyFieldAccess, CodeStyleOptions2.QualifyPropertyAccess, CodeStyleOptions2.QualifyMethodAccess, CodeStyleOptions2.QualifyEventAccess), + options: ImmutableHashSet.Create(CodeStyleOptions2.QualifyFieldAccess, CodeStyleOptions2.QualifyPropertyAccess, CodeStyleOptions2.QualifyMethodAccess, CodeStyleOptions2.QualifyEventAccess), new LocalizableResourceString(nameof(AnalyzersResources.Member_access_should_be_qualified), AnalyzersResources.ResourceManager, typeof(AnalyzersResources)), new LocalizableResourceString(nameof(AnalyzersResources.Add_this_or_Me_qualification), AnalyzersResources.ResourceManager, typeof(AnalyzersResources))) { diff --git a/src/Analyzers/Core/Analyzers/RemoveUnusedParametersAndValues/AbstractRemoveUnusedParametersAndValuesDiagnosticAnalyzer.cs b/src/Analyzers/Core/Analyzers/RemoveUnusedParametersAndValues/AbstractRemoveUnusedParametersAndValuesDiagnosticAnalyzer.cs index 8aab3857a16bf..e1cd8c1d0b5a5 100644 --- a/src/Analyzers/Core/Analyzers/RemoveUnusedParametersAndValues/AbstractRemoveUnusedParametersAndValuesDiagnosticAnalyzer.cs +++ b/src/Analyzers/Core/Analyzers/RemoveUnusedParametersAndValues/AbstractRemoveUnusedParametersAndValuesDiagnosticAnalyzer.cs @@ -91,14 +91,11 @@ internal abstract partial class AbstractRemoveUnusedParametersAndValuesDiagnosti protected AbstractRemoveUnusedParametersAndValuesDiagnosticAnalyzer( Option2> unusedValueExpressionStatementOption, - Option2> unusedValueAssignmentOption, - string language) - : base(ImmutableDictionary.Empty + Option2> unusedValueAssignmentOption) + : base(ImmutableDictionary.Empty .Add(s_expressionValueIsUnusedRule, unusedValueExpressionStatementOption) - .Add(s_valueAssignedIsUnusedRule, unusedValueAssignmentOption), - ImmutableDictionary.Empty - .Add(s_unusedParameterRule, CodeStyleOptions2.UnusedParameters), - language) + .Add(s_valueAssignedIsUnusedRule, unusedValueAssignmentOption) + .Add(s_unusedParameterRule, CodeStyleOptions2.UnusedParameters)) { } diff --git a/src/Analyzers/Core/Analyzers/UseCollectionInitializer/AbstractUseCollectionInitializerDiagnosticAnalyzer.cs b/src/Analyzers/Core/Analyzers/UseCollectionInitializer/AbstractUseCollectionInitializerDiagnosticAnalyzer.cs index d7eb4cf37ff2d..82a91fd9a8bc2 100644 --- a/src/Analyzers/Core/Analyzers/UseCollectionInitializer/AbstractUseCollectionInitializerDiagnosticAnalyzer.cs +++ b/src/Analyzers/Core/Analyzers/UseCollectionInitializer/AbstractUseCollectionInitializerDiagnosticAnalyzer.cs @@ -50,7 +50,7 @@ public override DiagnosticAnalyzerCategory GetAnalyzerCategory() isUnnecessary: true); protected AbstractUseCollectionInitializerDiagnosticAnalyzer() - : base(ImmutableDictionary.Empty + : base(ImmutableDictionary.Empty .Add(s_descriptor, CodeStyleOptions2.PreferCollectionInitializer) .Add(s_unnecessaryCodeDescriptor, CodeStyleOptions2.PreferCollectionInitializer)) { diff --git a/src/Analyzers/Core/Analyzers/UseInferredMemberName/AbstractUseInferredMemberNameDiagnosticAnalyzer.cs b/src/Analyzers/Core/Analyzers/UseInferredMemberName/AbstractUseInferredMemberNameDiagnosticAnalyzer.cs index 022fd3e1c26fc..283288bf8500f 100644 --- a/src/Analyzers/Core/Analyzers/UseInferredMemberName/AbstractUseInferredMemberNameDiagnosticAnalyzer.cs +++ b/src/Analyzers/Core/Analyzers/UseInferredMemberName/AbstractUseInferredMemberNameDiagnosticAnalyzer.cs @@ -17,7 +17,7 @@ internal abstract class AbstractUseInferredMemberNameDiagnosticAnalyzer : Abstra public AbstractUseInferredMemberNameDiagnosticAnalyzer() : base(IDEDiagnosticIds.UseInferredMemberNameDiagnosticId, EnforceOnBuildValues.UseInferredMemberName, - options: ImmutableHashSet.Create(CodeStyleOptions2.PreferInferredAnonymousTypeMemberNames, CodeStyleOptions2.PreferInferredTupleNames), + options: ImmutableHashSet.Create(CodeStyleOptions2.PreferInferredAnonymousTypeMemberNames, CodeStyleOptions2.PreferInferredTupleNames), fadingOption: null, new LocalizableResourceString(nameof(AnalyzersResources.Use_inferred_member_name), AnalyzersResources.ResourceManager, typeof(AnalyzersResources)), new LocalizableResourceString(nameof(AnalyzersResources.Member_name_can_be_simplified), AnalyzersResources.ResourceManager, typeof(AnalyzersResources))) diff --git a/src/Analyzers/Core/Analyzers/UseObjectInitializer/AbstractUseObjectInitializerDiagnosticAnalyzer.cs b/src/Analyzers/Core/Analyzers/UseObjectInitializer/AbstractUseObjectInitializerDiagnosticAnalyzer.cs index ea1e2ee9c8d2f..338787938cd22 100644 --- a/src/Analyzers/Core/Analyzers/UseObjectInitializer/AbstractUseObjectInitializerDiagnosticAnalyzer.cs +++ b/src/Analyzers/Core/Analyzers/UseObjectInitializer/AbstractUseObjectInitializerDiagnosticAnalyzer.cs @@ -47,7 +47,7 @@ internal abstract partial class AbstractUseObjectInitializerDiagnosticAnalyzer< protected abstract bool FadeOutOperatorToken { get; } protected AbstractUseObjectInitializerDiagnosticAnalyzer() - : base(ImmutableDictionary.Empty + : base(ImmutableDictionary.Empty .Add(s_descriptor, CodeStyleOptions2.PreferObjectInitializer) .Add(s_unnecessaryCodeDescriptor, CodeStyleOptions2.PreferObjectInitializer)) { diff --git a/src/Analyzers/Core/Analyzers/UseThrowExpression/AbstractUseThrowExpressionDiagnosticAnalyzer.cs b/src/Analyzers/Core/Analyzers/UseThrowExpression/AbstractUseThrowExpressionDiagnosticAnalyzer.cs index ac248ab899c67..11349a4bb9fc5 100644 --- a/src/Analyzers/Core/Analyzers/UseThrowExpression/AbstractUseThrowExpressionDiagnosticAnalyzer.cs +++ b/src/Analyzers/Core/Analyzers/UseThrowExpression/AbstractUseThrowExpressionDiagnosticAnalyzer.cs @@ -36,11 +36,10 @@ namespace Microsoft.CodeAnalysis.UseThrowExpression internal abstract class AbstractUseThrowExpressionDiagnosticAnalyzer : AbstractBuiltInCodeStyleDiagnosticAnalyzer { - protected AbstractUseThrowExpressionDiagnosticAnalyzer(Option2> preferThrowExpressionOption, string language) + protected AbstractUseThrowExpressionDiagnosticAnalyzer(Option2> preferThrowExpressionOption) : base(IDEDiagnosticIds.UseThrowExpressionDiagnosticId, EnforceOnBuildValues.UseThrowExpression, preferThrowExpressionOption, - language, new LocalizableResourceString(nameof(AnalyzersResources.Use_throw_expression), AnalyzersResources.ResourceManager, typeof(AnalyzersResources)), new LocalizableResourceString(nameof(AnalyzersResources.Null_check_can_be_simplified), AnalyzersResources.ResourceManager, typeof(AnalyzersResources))) { diff --git a/src/Analyzers/VisualBasic/Analyzers/ConvertTypeofToNameof/VisualBasicConvertTypeOfToNameOfDiagnosticAnalyzer.vb b/src/Analyzers/VisualBasic/Analyzers/ConvertTypeofToNameof/VisualBasicConvertTypeOfToNameOfDiagnosticAnalyzer.vb index 4d7be2cda526c..03d6de10849ac 100644 --- a/src/Analyzers/VisualBasic/Analyzers/ConvertTypeofToNameof/VisualBasicConvertTypeOfToNameOfDiagnosticAnalyzer.vb +++ b/src/Analyzers/VisualBasic/Analyzers/ConvertTypeofToNameof/VisualBasicConvertTypeOfToNameOfDiagnosticAnalyzer.vb @@ -15,7 +15,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.ConvertTypeOfToNameOf Private Shared ReadOnly s_title As String = VisualBasicAnalyzersResources.GetType_can_be_converted_to_NameOf Public Sub New() - MyBase.New(s_title, LanguageNames.VisualBasic) + MyBase.New(s_title) End Sub Protected Overrides Function IsValidTypeofAction(context As OperationAnalysisContext) As Boolean diff --git a/src/Analyzers/VisualBasic/Analyzers/FileHeaders/VisualBasicFileHeaderDiagnosticAnalyzer.vb b/src/Analyzers/VisualBasic/Analyzers/FileHeaders/VisualBasicFileHeaderDiagnosticAnalyzer.vb index c3a86d213acff..0b74c8e273998 100644 --- a/src/Analyzers/VisualBasic/Analyzers/FileHeaders/VisualBasicFileHeaderDiagnosticAnalyzer.vb +++ b/src/Analyzers/VisualBasic/Analyzers/FileHeaders/VisualBasicFileHeaderDiagnosticAnalyzer.vb @@ -9,11 +9,6 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.FileHeaders Friend Class VisualBasicFileHeaderDiagnosticAnalyzer Inherits AbstractFileHeaderDiagnosticAnalyzer - - Public Sub New() - MyBase.New(LanguageNames.VisualBasic) - End Sub - Protected Overrides ReadOnly Property FileHeaderHelper As AbstractFileHeaderHelper Get Return VisualBasicFileHeaderHelper.Instance diff --git a/src/Analyzers/VisualBasic/Analyzers/OrderModifiers/VisualBasicOrderModifiersDiagnosticAnalyzer.vb b/src/Analyzers/VisualBasic/Analyzers/OrderModifiers/VisualBasicOrderModifiersDiagnosticAnalyzer.vb index 1b4c58c2d5a4c..248a362a256d5 100644 --- a/src/Analyzers/VisualBasic/Analyzers/OrderModifiers/VisualBasicOrderModifiersDiagnosticAnalyzer.vb +++ b/src/Analyzers/VisualBasic/Analyzers/OrderModifiers/VisualBasicOrderModifiersDiagnosticAnalyzer.vb @@ -17,8 +17,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.OrderModifiers Public Sub New() MyBase.New(VisualBasicSyntaxFacts.Instance, VisualBasicCodeStyleOptions.PreferredModifierOrder, - VisualBasicOrderModifiersHelper.Instance, - LanguageNames.VisualBasic) + VisualBasicOrderModifiersHelper.Instance) End Sub Protected Overrides Function GetPreferredOrderStyle(context As SyntaxTreeAnalysisContext) As CodeStyleOption2(Of String) diff --git a/src/Analyzers/VisualBasic/Analyzers/RemoveUnusedParametersAndValues/VisualBasicRemoveUnusedParametersAndValuesDiagnosticAnalyzer.vb b/src/Analyzers/VisualBasic/Analyzers/RemoveUnusedParametersAndValues/VisualBasicRemoveUnusedParametersAndValuesDiagnosticAnalyzer.vb index e39bf4080a7bb..6cabd6a9f319f 100644 --- a/src/Analyzers/VisualBasic/Analyzers/RemoveUnusedParametersAndValues/VisualBasicRemoveUnusedParametersAndValuesDiagnosticAnalyzer.vb +++ b/src/Analyzers/VisualBasic/Analyzers/RemoveUnusedParametersAndValues/VisualBasicRemoveUnusedParametersAndValuesDiagnosticAnalyzer.vb @@ -17,8 +17,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.RemoveUnusedParametersAndValues Public Sub New() MyBase.New(unusedValueExpressionStatementOption:=VisualBasicCodeStyleOptions.UnusedValueExpressionStatement, - unusedValueAssignmentOption:=VisualBasicCodeStyleOptions.UnusedValueAssignment, - LanguageNames.VisualBasic) + unusedValueAssignmentOption:=VisualBasicCodeStyleOptions.UnusedValueAssignment) End Sub Protected Overrides Function GetUnusedValueExpressionStatementOption(provider As AnalyzerOptionsProvider) As CodeStyleOption2(Of UnusedValuePreference) diff --git a/src/Analyzers/VisualBasic/Analyzers/SimplifyObjectCreation/VisualBasicSimplifyObjectCreationDiagnosticAnalyzer.vb b/src/Analyzers/VisualBasic/Analyzers/SimplifyObjectCreation/VisualBasicSimplifyObjectCreationDiagnosticAnalyzer.vb index 1d3c7dab45686..02a378358e0ca 100644 --- a/src/Analyzers/VisualBasic/Analyzers/SimplifyObjectCreation/VisualBasicSimplifyObjectCreationDiagnosticAnalyzer.vb +++ b/src/Analyzers/VisualBasic/Analyzers/SimplifyObjectCreation/VisualBasicSimplifyObjectCreationDiagnosticAnalyzer.vb @@ -17,7 +17,6 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.SimplifyObjectCreation diagnosticId:=IDEDiagnosticIds.SimplifyObjectCreationDiagnosticId, enforceOnBuild:=EnforceOnBuildValues.SimplifyObjectCreation, [option]:=VisualBasicCodeStyleOptions.PreferSimplifiedObjectCreation, - language:=LanguageNames.VisualBasic, title:=New LocalizableResourceString(NameOf(VisualBasicAnalyzersResources.Object_creation_can_be_simplified), VisualBasicAnalyzersResources.ResourceManager, GetType(VisualBasicAnalyzersResources))) End Sub diff --git a/src/Analyzers/VisualBasic/Analyzers/UseIsNotExpression/VisualBasicUseIsNotDiagnosticAnalyzer.vb b/src/Analyzers/VisualBasic/Analyzers/UseIsNotExpression/VisualBasicUseIsNotDiagnosticAnalyzer.vb index 1d45d92b2af15..66979d3d6244c 100644 --- a/src/Analyzers/VisualBasic/Analyzers/UseIsNotExpression/VisualBasicUseIsNotDiagnosticAnalyzer.vb +++ b/src/Analyzers/VisualBasic/Analyzers/UseIsNotExpression/VisualBasicUseIsNotDiagnosticAnalyzer.vb @@ -27,7 +27,6 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.UseIsNotExpression MyBase.New(IDEDiagnosticIds.UseIsNotExpressionDiagnosticId, EnforceOnBuildValues.UseIsNotExpression, VisualBasicCodeStyleOptions.PreferIsNotExpression, - LanguageNames.VisualBasic, New LocalizableResourceString( NameOf(VisualBasicAnalyzersResources.Use_IsNot_expression), VisualBasicAnalyzersResources.ResourceManager, GetType(VisualBasicAnalyzersResources))) End Sub diff --git a/src/Features/CSharp/Portable/UsePatternMatching/CSharpIsAndCastCheckWithoutNameDiagnosticAnalyzer.cs b/src/Features/CSharp/Portable/UsePatternMatching/CSharpIsAndCastCheckWithoutNameDiagnosticAnalyzer.cs index 80b25c4018b50..fb69a5fc05b60 100644 --- a/src/Features/CSharp/Portable/UsePatternMatching/CSharpIsAndCastCheckWithoutNameDiagnosticAnalyzer.cs +++ b/src/Features/CSharp/Portable/UsePatternMatching/CSharpIsAndCastCheckWithoutNameDiagnosticAnalyzer.cs @@ -44,7 +44,6 @@ public CSharpIsAndCastCheckWithoutNameDiagnosticAnalyzer() : base(IDEDiagnosticIds.InlineIsTypeWithoutNameCheckDiagnosticsId, EnforceOnBuildValues.InlineIsTypeWithoutName, CSharpCodeStyleOptions.PreferPatternMatchingOverIsWithCastCheck, - LanguageNames.CSharp, new LocalizableResourceString( nameof(CSharpAnalyzersResources.Use_pattern_matching), CSharpAnalyzersResources.ResourceManager, typeof(CSharpAnalyzersResources))) { diff --git a/src/Features/Core/Portable/CodeStyle/AbstractCodeStyleProvider.Analysis.cs b/src/Features/Core/Portable/CodeStyle/AbstractCodeStyleProvider.Analysis.cs index 8c093cc1aa3f6..af2c01f70e7a6 100644 --- a/src/Features/Core/Portable/CodeStyle/AbstractCodeStyleProvider.Analysis.cs +++ b/src/Features/Core/Portable/CodeStyle/AbstractCodeStyleProvider.Analysis.cs @@ -30,7 +30,6 @@ private DiagnosticAnalyzer(TCodeStyleProvider codeStyleProvider, bool isUnnecess : base(codeStyleProvider._descriptorId, codeStyleProvider._enforceOnBuild, codeStyleProvider._option, - codeStyleProvider._language, codeStyleProvider._title, codeStyleProvider._message, isUnnecessary, diff --git a/src/Features/Core/Portable/PreferFrameworkType/PreferFrameworkTypeDiagnosticAnalyzerBase.cs b/src/Features/Core/Portable/PreferFrameworkType/PreferFrameworkTypeDiagnosticAnalyzerBase.cs index 522441f62cc73..5ac72d6773425 100644 --- a/src/Features/Core/Portable/PreferFrameworkType/PreferFrameworkTypeDiagnosticAnalyzerBase.cs +++ b/src/Features/Core/Portable/PreferFrameworkType/PreferFrameworkTypeDiagnosticAnalyzerBase.cs @@ -20,7 +20,7 @@ internal abstract class PreferFrameworkTypeDiagnosticAnalyzerBase(CodeStyleOptions2.PreferIntrinsicPredefinedTypeKeywordInDeclaration, CodeStyleOptions2.PreferIntrinsicPredefinedTypeKeywordInMemberAccess), + options: ImmutableHashSet.Create(CodeStyleOptions2.PreferIntrinsicPredefinedTypeKeywordInDeclaration, CodeStyleOptions2.PreferIntrinsicPredefinedTypeKeywordInMemberAccess), new LocalizableResourceString(nameof(FeaturesResources.Use_framework_type), FeaturesResources.ResourceManager, typeof(FeaturesResources)), new LocalizableResourceString(nameof(FeaturesResources.Use_framework_type), FeaturesResources.ResourceManager, typeof(FeaturesResources))) { diff --git a/src/Features/Core/Portable/SimplifyThisOrMe/AbstractSimplifyThisOrMeDiagnosticAnalyzer.cs b/src/Features/Core/Portable/SimplifyThisOrMe/AbstractSimplifyThisOrMeDiagnosticAnalyzer.cs index 2e07a6264439e..0ddd614cd385d 100644 --- a/src/Features/Core/Portable/SimplifyThisOrMe/AbstractSimplifyThisOrMeDiagnosticAnalyzer.cs +++ b/src/Features/Core/Portable/SimplifyThisOrMe/AbstractSimplifyThisOrMeDiagnosticAnalyzer.cs @@ -30,7 +30,7 @@ internal abstract class AbstractSimplifyThisOrMeDiagnosticAnalyzer< protected AbstractSimplifyThisOrMeDiagnosticAnalyzer() : base(IDEDiagnosticIds.RemoveThisOrMeQualificationDiagnosticId, EnforceOnBuildValues.RemoveQualification, - ImmutableHashSet.Create(CodeStyleOptions2.QualifyFieldAccess, CodeStyleOptions2.QualifyPropertyAccess, CodeStyleOptions2.QualifyMethodAccess, CodeStyleOptions2.QualifyEventAccess), + ImmutableHashSet.Create(CodeStyleOptions2.QualifyFieldAccess, CodeStyleOptions2.QualifyPropertyAccess, CodeStyleOptions2.QualifyMethodAccess, CodeStyleOptions2.QualifyEventAccess), fadingOption: null, new LocalizableResourceString(nameof(FeaturesResources.Remove_qualification), FeaturesResources.ResourceManager, typeof(FeaturesResources)), new LocalizableResourceString(nameof(WorkspacesResources.Name_can_be_simplified), WorkspacesResources.ResourceManager, typeof(WorkspacesResources))) From fcf38396f8bf2eb90df1eab1907e8ef34cc43939 Mon Sep 17 00:00:00 2001 From: Youssef1313 Date: Thu, 21 Jul 2022 14:04:25 +0200 Subject: [PATCH 2/2] Fix build error --- .../UseExpressionBodyForLambdaDiagnosticAnalyzer.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Analyzers/CSharp/Analyzers/UseExpressionBodyForLambda/UseExpressionBodyForLambdaDiagnosticAnalyzer.cs b/src/Analyzers/CSharp/Analyzers/UseExpressionBodyForLambda/UseExpressionBodyForLambdaDiagnosticAnalyzer.cs index f825a08126ceb..8d6402cb795d3 100644 --- a/src/Analyzers/CSharp/Analyzers/UseExpressionBodyForLambda/UseExpressionBodyForLambdaDiagnosticAnalyzer.cs +++ b/src/Analyzers/CSharp/Analyzers/UseExpressionBodyForLambda/UseExpressionBodyForLambdaDiagnosticAnalyzer.cs @@ -21,10 +21,9 @@ internal sealed class UseExpressionBodyForLambdaDiagnosticAnalyzer : AbstractBui private static readonly DiagnosticDescriptor s_useBlockBodyForLambda = CreateDescriptorWithId(UseExpressionBodyForLambdaHelpers.UseBlockBodyTitle, UseExpressionBodyForLambdaHelpers.UseBlockBodyTitle); public UseExpressionBodyForLambdaDiagnosticAnalyzer() : base( - ImmutableDictionary.Empty + ImmutableDictionary.Empty .Add(s_useExpressionBodyForLambda, CSharpCodeStyleOptions.PreferExpressionBodiedLambdas) - .Add(s_useBlockBodyForLambda, CSharpCodeStyleOptions.PreferExpressionBodiedLambdas), - LanguageNames.CSharp) + .Add(s_useBlockBodyForLambda, CSharpCodeStyleOptions.PreferExpressionBodiedLambdas)) { }