diff --git a/src/EditorFeatures/CSharp/EditorConfigSettings/DataProvider/Formatting/CSharpFormattingSettingsLanguageServiceFactory.cs b/src/EditorFeatures/CSharp/EditorConfigSettings/DataProvider/Whitespace/CSharpWhitespaceSettingsLanguageServiceFactory.cs similarity index 77% rename from src/EditorFeatures/CSharp/EditorConfigSettings/DataProvider/Formatting/CSharpFormattingSettingsLanguageServiceFactory.cs rename to src/EditorFeatures/CSharp/EditorConfigSettings/DataProvider/Whitespace/CSharpWhitespaceSettingsLanguageServiceFactory.cs index 550c7bf77b32a..c25632bc19171 100644 --- a/src/EditorFeatures/CSharp/EditorConfigSettings/DataProvider/Formatting/CSharpFormattingSettingsLanguageServiceFactory.cs +++ b/src/EditorFeatures/CSharp/EditorConfigSettings/DataProvider/Whitespace/CSharpWhitespaceSettingsLanguageServiceFactory.cs @@ -10,21 +10,21 @@ using Microsoft.CodeAnalysis.Host; using Microsoft.CodeAnalysis.Host.Mef; -namespace Microsoft.VisualStudio.LanguageServices.CSharp.EditorConfigSettings.DataProvider.Formatting +namespace Microsoft.VisualStudio.LanguageServices.CSharp.EditorConfigSettings.DataProvider.Whitespace { - [ExportLanguageServiceFactory(typeof(ILanguageSettingsProviderFactory), LanguageNames.CSharp), Shared] - internal class CSharpFormattingSettingsLanguageServiceFactory : ILanguageServiceFactory + [ExportLanguageServiceFactory(typeof(ILanguageSettingsProviderFactory), LanguageNames.CSharp), Shared] + internal class CSharpWhitespaceSettingsLanguageServiceFactory : ILanguageServiceFactory { [ImportingConstructor] [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)] - public CSharpFormattingSettingsLanguageServiceFactory() + public CSharpWhitespaceSettingsLanguageServiceFactory() { } public ILanguageService CreateLanguageService(HostLanguageServices languageServices) { var workspace = languageServices.WorkspaceServices.Workspace; - return new CSharpFormattingSettingsProviderFactory(workspace); + return new CSharpWhitespaceSettingsProviderFactory(workspace); } } } diff --git a/src/EditorFeatures/CSharp/EditorConfigSettings/DataProvider/Formatting/CSharpFormattingSettingsProvider.cs b/src/EditorFeatures/CSharp/EditorConfigSettings/DataProvider/Whitespace/CSharpWhitespaceSettingsProvider.cs similarity index 74% rename from src/EditorFeatures/CSharp/EditorConfigSettings/DataProvider/Formatting/CSharpFormattingSettingsProvider.cs rename to src/EditorFeatures/CSharp/EditorConfigSettings/DataProvider/Whitespace/CSharpWhitespaceSettingsProvider.cs index 860f5d64cbd56..73d2b4ad29481 100644 --- a/src/EditorFeatures/CSharp/EditorConfigSettings/DataProvider/Formatting/CSharpFormattingSettingsProvider.cs +++ b/src/EditorFeatures/CSharp/EditorConfigSettings/DataProvider/Whitespace/CSharpWhitespaceSettingsProvider.cs @@ -14,12 +14,12 @@ using Microsoft.CodeAnalysis.Editor.EditorConfigSettings.Updater; using Microsoft.CodeAnalysis.Options; -namespace Microsoft.VisualStudio.LanguageServices.CSharp.EditorConfigSettings.DataProvider.Formatting +namespace Microsoft.VisualStudio.LanguageServices.CSharp.EditorConfigSettings.DataProvider.Whitespace { - internal class CSharpFormattingSettingsProvider : SettingsProviderBase + internal class CSharpWhitespaceSettingsProvider : SettingsProviderBase { - public CSharpFormattingSettingsProvider(string FileName, OptionUpdater updaterService, Workspace workspace) - : base(FileName, updaterService, workspace) + public CSharpWhitespaceSettingsProvider(string filePath, OptionUpdater updaterService, Workspace workspace) + : base(filePath, updaterService, workspace) { Update(); } @@ -36,71 +36,71 @@ protected override void UpdateOptions(AnalyzerConfigOptions editorConfigOptions, AddRange(wrappingOptions.ToImmutableArray()); } - private IEnumerable GetSpacingOptions(AnalyzerConfigOptions editorConfigOptions, OptionSet visualStudioOptions, OptionUpdater updaterService) + private IEnumerable GetSpacingOptions(AnalyzerConfigOptions editorConfigOptions, OptionSet visualStudioOptions, OptionUpdater updaterService) { - yield return FormattingSetting.Create(CSharpFormattingOptions2.SpacingAfterMethodDeclarationName, CSharpEditorResources.Insert_space_between_method_name_and_its_opening_parenthesis2, editorConfigOptions, visualStudioOptions, updaterService, FileName); - yield return FormattingSetting.Create(CSharpFormattingOptions2.SpaceWithinMethodDeclarationParenthesis, CSharpEditorResources.Insert_space_within_parameter_list_parentheses, editorConfigOptions, visualStudioOptions, updaterService, FileName); - yield return FormattingSetting.Create(CSharpFormattingOptions2.SpaceBetweenEmptyMethodDeclarationParentheses, CSharpEditorResources.Insert_space_within_empty_parameter_list_parentheses, editorConfigOptions, visualStudioOptions, updaterService, FileName); - yield return FormattingSetting.Create(CSharpFormattingOptions2.SpaceAfterMethodCallName, CSharpEditorResources.Insert_space_between_method_name_and_its_opening_parenthesis1, editorConfigOptions, visualStudioOptions, updaterService, FileName); - yield return FormattingSetting.Create(CSharpFormattingOptions2.SpaceWithinMethodCallParentheses, CSharpEditorResources.Insert_space_within_argument_list_parentheses, editorConfigOptions, visualStudioOptions, updaterService, FileName); - yield return FormattingSetting.Create(CSharpFormattingOptions2.SpaceBetweenEmptyMethodCallParentheses, CSharpEditorResources.Insert_space_within_empty_argument_list_parentheses, editorConfigOptions, visualStudioOptions, updaterService, FileName); + yield return WhitespaceSetting.Create(CSharpFormattingOptions2.SpacingAfterMethodDeclarationName, CSharpEditorResources.Insert_space_between_method_name_and_its_opening_parenthesis2, editorConfigOptions, visualStudioOptions, updaterService, FileName); + yield return WhitespaceSetting.Create(CSharpFormattingOptions2.SpaceWithinMethodDeclarationParenthesis, CSharpEditorResources.Insert_space_within_parameter_list_parentheses, editorConfigOptions, visualStudioOptions, updaterService, FileName); + yield return WhitespaceSetting.Create(CSharpFormattingOptions2.SpaceBetweenEmptyMethodDeclarationParentheses, CSharpEditorResources.Insert_space_within_empty_parameter_list_parentheses, editorConfigOptions, visualStudioOptions, updaterService, FileName); + yield return WhitespaceSetting.Create(CSharpFormattingOptions2.SpaceAfterMethodCallName, CSharpEditorResources.Insert_space_between_method_name_and_its_opening_parenthesis1, editorConfigOptions, visualStudioOptions, updaterService, FileName); + yield return WhitespaceSetting.Create(CSharpFormattingOptions2.SpaceWithinMethodCallParentheses, CSharpEditorResources.Insert_space_within_argument_list_parentheses, editorConfigOptions, visualStudioOptions, updaterService, FileName); + yield return WhitespaceSetting.Create(CSharpFormattingOptions2.SpaceBetweenEmptyMethodCallParentheses, CSharpEditorResources.Insert_space_within_empty_argument_list_parentheses, editorConfigOptions, visualStudioOptions, updaterService, FileName); - yield return FormattingSetting.Create(CSharpFormattingOptions2.SpaceAfterControlFlowStatementKeyword, CSharpEditorResources.Insert_space_after_keywords_in_control_flow_statements, editorConfigOptions, visualStudioOptions, updaterService, FileName); - yield return FormattingSetting.Create(CSharpFormattingOptions2.SpaceWithinExpressionParentheses, CSharpEditorResources.Insert_space_within_parentheses_of_expressions, editorConfigOptions, visualStudioOptions, updaterService, FileName); - yield return FormattingSetting.Create(CSharpFormattingOptions2.SpaceWithinCastParentheses, CSharpEditorResources.Insert_space_within_parentheses_of_type_casts, editorConfigOptions, visualStudioOptions, updaterService, FileName); - yield return FormattingSetting.Create(CSharpFormattingOptions2.SpaceWithinOtherParentheses, CSharpEditorResources.Insert_spaces_within_parentheses_of_control_flow_statements, editorConfigOptions, visualStudioOptions, updaterService, FileName); - yield return FormattingSetting.Create(CSharpFormattingOptions2.SpaceAfterCast, CSharpEditorResources.Insert_space_after_cast, editorConfigOptions, visualStudioOptions, updaterService, FileName); - yield return FormattingSetting.Create(CSharpFormattingOptions2.SpacesIgnoreAroundVariableDeclaration, CSharpEditorResources.Ignore_spaces_in_declaration_statements, editorConfigOptions, visualStudioOptions, updaterService, FileName); + yield return WhitespaceSetting.Create(CSharpFormattingOptions2.SpaceAfterControlFlowStatementKeyword, CSharpEditorResources.Insert_space_after_keywords_in_control_flow_statements, editorConfigOptions, visualStudioOptions, updaterService, FileName); + yield return WhitespaceSetting.Create(CSharpFormattingOptions2.SpaceWithinExpressionParentheses, CSharpEditorResources.Insert_space_within_parentheses_of_expressions, editorConfigOptions, visualStudioOptions, updaterService, FileName); + yield return WhitespaceSetting.Create(CSharpFormattingOptions2.SpaceWithinCastParentheses, CSharpEditorResources.Insert_space_within_parentheses_of_type_casts, editorConfigOptions, visualStudioOptions, updaterService, FileName); + yield return WhitespaceSetting.Create(CSharpFormattingOptions2.SpaceWithinOtherParentheses, CSharpEditorResources.Insert_spaces_within_parentheses_of_control_flow_statements, editorConfigOptions, visualStudioOptions, updaterService, FileName); + yield return WhitespaceSetting.Create(CSharpFormattingOptions2.SpaceAfterCast, CSharpEditorResources.Insert_space_after_cast, editorConfigOptions, visualStudioOptions, updaterService, FileName); + yield return WhitespaceSetting.Create(CSharpFormattingOptions2.SpacesIgnoreAroundVariableDeclaration, CSharpEditorResources.Ignore_spaces_in_declaration_statements, editorConfigOptions, visualStudioOptions, updaterService, FileName); - yield return FormattingSetting.Create(CSharpFormattingOptions2.SpaceBeforeOpenSquareBracket, CSharpEditorResources.Insert_space_before_open_square_bracket, editorConfigOptions, visualStudioOptions, updaterService, FileName); - yield return FormattingSetting.Create(CSharpFormattingOptions2.SpaceBetweenEmptySquareBrackets, CSharpEditorResources.Insert_space_within_empty_square_brackets, editorConfigOptions, visualStudioOptions, updaterService, FileName); - yield return FormattingSetting.Create(CSharpFormattingOptions2.SpaceWithinSquareBrackets, CSharpEditorResources.Insert_spaces_within_square_brackets, editorConfigOptions, visualStudioOptions, updaterService, FileName); + yield return WhitespaceSetting.Create(CSharpFormattingOptions2.SpaceBeforeOpenSquareBracket, CSharpEditorResources.Insert_space_before_open_square_bracket, editorConfigOptions, visualStudioOptions, updaterService, FileName); + yield return WhitespaceSetting.Create(CSharpFormattingOptions2.SpaceBetweenEmptySquareBrackets, CSharpEditorResources.Insert_space_within_empty_square_brackets, editorConfigOptions, visualStudioOptions, updaterService, FileName); + yield return WhitespaceSetting.Create(CSharpFormattingOptions2.SpaceWithinSquareBrackets, CSharpEditorResources.Insert_spaces_within_square_brackets, editorConfigOptions, visualStudioOptions, updaterService, FileName); - yield return FormattingSetting.Create(CSharpFormattingOptions2.SpaceAfterColonInBaseTypeDeclaration, CSharpEditorResources.Insert_space_after_colon_for_base_or_interface_in_type_declaration, editorConfigOptions, visualStudioOptions, updaterService, FileName); - yield return FormattingSetting.Create(CSharpFormattingOptions2.SpaceAfterComma, CSharpEditorResources.Insert_space_after_comma, editorConfigOptions, visualStudioOptions, updaterService, FileName); - yield return FormattingSetting.Create(CSharpFormattingOptions2.SpaceAfterDot, CSharpEditorResources.Insert_space_after_dot, editorConfigOptions, visualStudioOptions, updaterService, FileName); - yield return FormattingSetting.Create(CSharpFormattingOptions2.SpaceAfterSemicolonsInForStatement, CSharpEditorResources.Insert_space_after_semicolon_in_for_statement, editorConfigOptions, visualStudioOptions, updaterService, FileName); - yield return FormattingSetting.Create(CSharpFormattingOptions2.SpaceBeforeColonInBaseTypeDeclaration, CSharpEditorResources.Insert_space_before_colon_for_base_or_interface_in_type_declaration, editorConfigOptions, visualStudioOptions, updaterService, FileName); - yield return FormattingSetting.Create(CSharpFormattingOptions2.SpaceBeforeComma, CSharpEditorResources.Insert_space_before_comma, editorConfigOptions, visualStudioOptions, updaterService, FileName); - yield return FormattingSetting.Create(CSharpFormattingOptions2.SpaceBeforeDot, CSharpEditorResources.Insert_space_before_dot, editorConfigOptions, visualStudioOptions, updaterService, FileName); - yield return FormattingSetting.Create(CSharpFormattingOptions2.SpaceBeforeSemicolonsInForStatement, CSharpEditorResources.Insert_space_before_semicolon_in_for_statement, editorConfigOptions, visualStudioOptions, updaterService, FileName); + yield return WhitespaceSetting.Create(CSharpFormattingOptions2.SpaceAfterColonInBaseTypeDeclaration, CSharpEditorResources.Insert_space_after_colon_for_base_or_interface_in_type_declaration, editorConfigOptions, visualStudioOptions, updaterService, FileName); + yield return WhitespaceSetting.Create(CSharpFormattingOptions2.SpaceAfterComma, CSharpEditorResources.Insert_space_after_comma, editorConfigOptions, visualStudioOptions, updaterService, FileName); + yield return WhitespaceSetting.Create(CSharpFormattingOptions2.SpaceAfterDot, CSharpEditorResources.Insert_space_after_dot, editorConfigOptions, visualStudioOptions, updaterService, FileName); + yield return WhitespaceSetting.Create(CSharpFormattingOptions2.SpaceAfterSemicolonsInForStatement, CSharpEditorResources.Insert_space_after_semicolon_in_for_statement, editorConfigOptions, visualStudioOptions, updaterService, FileName); + yield return WhitespaceSetting.Create(CSharpFormattingOptions2.SpaceBeforeColonInBaseTypeDeclaration, CSharpEditorResources.Insert_space_before_colon_for_base_or_interface_in_type_declaration, editorConfigOptions, visualStudioOptions, updaterService, FileName); + yield return WhitespaceSetting.Create(CSharpFormattingOptions2.SpaceBeforeComma, CSharpEditorResources.Insert_space_before_comma, editorConfigOptions, visualStudioOptions, updaterService, FileName); + yield return WhitespaceSetting.Create(CSharpFormattingOptions2.SpaceBeforeDot, CSharpEditorResources.Insert_space_before_dot, editorConfigOptions, visualStudioOptions, updaterService, FileName); + yield return WhitespaceSetting.Create(CSharpFormattingOptions2.SpaceBeforeSemicolonsInForStatement, CSharpEditorResources.Insert_space_before_semicolon_in_for_statement, editorConfigOptions, visualStudioOptions, updaterService, FileName); - yield return FormattingSetting.Create(CSharpFormattingOptions2.SpacingAroundBinaryOperator, CSharpEditorResources.Set_spacing_for_operators, editorConfigOptions, visualStudioOptions, updaterService, FileName); + yield return WhitespaceSetting.Create(CSharpFormattingOptions2.SpacingAroundBinaryOperator, CSharpEditorResources.Set_spacing_for_operators, editorConfigOptions, visualStudioOptions, updaterService, FileName); } - private IEnumerable GetNewLineOptions(AnalyzerConfigOptions editorConfigOptions, OptionSet visualStudioOptions, OptionUpdater updaterService) + private IEnumerable GetNewLineOptions(AnalyzerConfigOptions editorConfigOptions, OptionSet visualStudioOptions, OptionUpdater updaterService) { - yield return FormattingSetting.Create(CSharpFormattingOptions2.NewLinesForBracesInTypes, CSharpEditorResources.Place_open_brace_on_new_line_for_types, editorConfigOptions, visualStudioOptions, updaterService, FileName); - yield return FormattingSetting.Create(CSharpFormattingOptions2.NewLinesForBracesInMethods, CSharpEditorResources.Place_open_brace_on_new_line_for_methods_local_functions, editorConfigOptions, visualStudioOptions, updaterService, FileName); - yield return FormattingSetting.Create(CSharpFormattingOptions2.NewLinesForBracesInProperties, CSharpEditorResources.Place_open_brace_on_new_line_for_properties_indexers_and_events, editorConfigOptions, visualStudioOptions, updaterService, FileName); - yield return FormattingSetting.Create(CSharpFormattingOptions2.NewLinesForBracesInAccessors, CSharpEditorResources.Place_open_brace_on_new_line_for_property_indexer_and_event_accessors, editorConfigOptions, visualStudioOptions, updaterService, FileName); - yield return FormattingSetting.Create(CSharpFormattingOptions2.NewLinesForBracesInAnonymousMethods, CSharpEditorResources.Place_open_brace_on_new_line_for_anonymous_methods, editorConfigOptions, visualStudioOptions, updaterService, FileName); - yield return FormattingSetting.Create(CSharpFormattingOptions2.NewLinesForBracesInControlBlocks, CSharpEditorResources.Place_open_brace_on_new_line_for_control_blocks, editorConfigOptions, visualStudioOptions, updaterService, FileName); - yield return FormattingSetting.Create(CSharpFormattingOptions2.NewLinesForBracesInAnonymousTypes, CSharpEditorResources.Place_open_brace_on_new_line_for_anonymous_types, editorConfigOptions, visualStudioOptions, updaterService, FileName); - yield return FormattingSetting.Create(CSharpFormattingOptions2.NewLinesForBracesInObjectCollectionArrayInitializers, CSharpEditorResources.Place_open_brace_on_new_line_for_object_collection_array_and_with_initializers, editorConfigOptions, visualStudioOptions, updaterService, FileName); - yield return FormattingSetting.Create(CSharpFormattingOptions2.NewLinesForBracesInLambdaExpressionBody, CSharpEditorResources.Place_open_brace_on_new_line_for_lambda_expression, editorConfigOptions, visualStudioOptions, updaterService, FileName); - yield return FormattingSetting.Create(CSharpFormattingOptions2.NewLineForElse, CSharpEditorResources.Place_else_on_new_line, editorConfigOptions, visualStudioOptions, updaterService, FileName); - yield return FormattingSetting.Create(CSharpFormattingOptions2.NewLineForCatch, CSharpEditorResources.Place_catch_on_new_line, editorConfigOptions, visualStudioOptions, updaterService, FileName); - yield return FormattingSetting.Create(CSharpFormattingOptions2.NewLineForFinally, CSharpEditorResources.Place_finally_on_new_line, editorConfigOptions, visualStudioOptions, updaterService, FileName); - yield return FormattingSetting.Create(CSharpFormattingOptions2.NewLineForMembersInObjectInit, CSharpEditorResources.Place_members_in_object_initializers_on_new_line, editorConfigOptions, visualStudioOptions, updaterService, FileName); - yield return FormattingSetting.Create(CSharpFormattingOptions2.NewLineForMembersInAnonymousTypes, CSharpEditorResources.Place_members_in_anonymous_types_on_new_line, editorConfigOptions, visualStudioOptions, updaterService, FileName); - yield return FormattingSetting.Create(CSharpFormattingOptions2.NewLineForClausesInQuery, CSharpEditorResources.Place_query_expression_clauses_on_new_line, editorConfigOptions, visualStudioOptions, updaterService, FileName); + yield return WhitespaceSetting.Create(CSharpFormattingOptions2.NewLinesForBracesInTypes, CSharpEditorResources.Place_open_brace_on_new_line_for_types, editorConfigOptions, visualStudioOptions, updaterService, FileName); + yield return WhitespaceSetting.Create(CSharpFormattingOptions2.NewLinesForBracesInMethods, CSharpEditorResources.Place_open_brace_on_new_line_for_methods_local_functions, editorConfigOptions, visualStudioOptions, updaterService, FileName); + yield return WhitespaceSetting.Create(CSharpFormattingOptions2.NewLinesForBracesInProperties, CSharpEditorResources.Place_open_brace_on_new_line_for_properties_indexers_and_events, editorConfigOptions, visualStudioOptions, updaterService, FileName); + yield return WhitespaceSetting.Create(CSharpFormattingOptions2.NewLinesForBracesInAccessors, CSharpEditorResources.Place_open_brace_on_new_line_for_property_indexer_and_event_accessors, editorConfigOptions, visualStudioOptions, updaterService, FileName); + yield return WhitespaceSetting.Create(CSharpFormattingOptions2.NewLinesForBracesInAnonymousMethods, CSharpEditorResources.Place_open_brace_on_new_line_for_anonymous_methods, editorConfigOptions, visualStudioOptions, updaterService, FileName); + yield return WhitespaceSetting.Create(CSharpFormattingOptions2.NewLinesForBracesInControlBlocks, CSharpEditorResources.Place_open_brace_on_new_line_for_control_blocks, editorConfigOptions, visualStudioOptions, updaterService, FileName); + yield return WhitespaceSetting.Create(CSharpFormattingOptions2.NewLinesForBracesInAnonymousTypes, CSharpEditorResources.Place_open_brace_on_new_line_for_anonymous_types, editorConfigOptions, visualStudioOptions, updaterService, FileName); + yield return WhitespaceSetting.Create(CSharpFormattingOptions2.NewLinesForBracesInObjectCollectionArrayInitializers, CSharpEditorResources.Place_open_brace_on_new_line_for_object_collection_array_and_with_initializers, editorConfigOptions, visualStudioOptions, updaterService, FileName); + yield return WhitespaceSetting.Create(CSharpFormattingOptions2.NewLinesForBracesInLambdaExpressionBody, CSharpEditorResources.Place_open_brace_on_new_line_for_lambda_expression, editorConfigOptions, visualStudioOptions, updaterService, FileName); + yield return WhitespaceSetting.Create(CSharpFormattingOptions2.NewLineForElse, CSharpEditorResources.Place_else_on_new_line, editorConfigOptions, visualStudioOptions, updaterService, FileName); + yield return WhitespaceSetting.Create(CSharpFormattingOptions2.NewLineForCatch, CSharpEditorResources.Place_catch_on_new_line, editorConfigOptions, visualStudioOptions, updaterService, FileName); + yield return WhitespaceSetting.Create(CSharpFormattingOptions2.NewLineForFinally, CSharpEditorResources.Place_finally_on_new_line, editorConfigOptions, visualStudioOptions, updaterService, FileName); + yield return WhitespaceSetting.Create(CSharpFormattingOptions2.NewLineForMembersInObjectInit, CSharpEditorResources.Place_members_in_object_initializers_on_new_line, editorConfigOptions, visualStudioOptions, updaterService, FileName); + yield return WhitespaceSetting.Create(CSharpFormattingOptions2.NewLineForMembersInAnonymousTypes, CSharpEditorResources.Place_members_in_anonymous_types_on_new_line, editorConfigOptions, visualStudioOptions, updaterService, FileName); + yield return WhitespaceSetting.Create(CSharpFormattingOptions2.NewLineForClausesInQuery, CSharpEditorResources.Place_query_expression_clauses_on_new_line, editorConfigOptions, visualStudioOptions, updaterService, FileName); } - private IEnumerable GetIndentationOptions(AnalyzerConfigOptions editorConfigOptions, OptionSet visualStudioOptions, OptionUpdater updaterService) + private IEnumerable GetIndentationOptions(AnalyzerConfigOptions editorConfigOptions, OptionSet visualStudioOptions, OptionUpdater updaterService) { - yield return FormattingSetting.Create(CSharpFormattingOptions2.IndentBlock, CSharpEditorResources.Indent_block_contents, editorConfigOptions, visualStudioOptions, updaterService, FileName); - yield return FormattingSetting.Create(CSharpFormattingOptions2.IndentBraces, CSharpEditorResources.Indent_open_and_close_braces, editorConfigOptions, visualStudioOptions, updaterService, FileName); - yield return FormattingSetting.Create(CSharpFormattingOptions2.IndentSwitchCaseSection, CSharpEditorResources.Indent_case_contents, editorConfigOptions, visualStudioOptions, updaterService, FileName); - yield return FormattingSetting.Create(CSharpFormattingOptions2.IndentSwitchCaseSectionWhenBlock, CSharpEditorResources.Indent_case_contents_when_block, editorConfigOptions, visualStudioOptions, updaterService, FileName); - yield return FormattingSetting.Create(CSharpFormattingOptions2.IndentSwitchSection, CSharpEditorResources.Indent_case_labels, editorConfigOptions, visualStudioOptions, updaterService, FileName); - yield return FormattingSetting.Create(CSharpFormattingOptions2.LabelPositioning, CSharpEditorResources.Label_Indentation, editorConfigOptions, visualStudioOptions, updaterService, FileName); + yield return WhitespaceSetting.Create(CSharpFormattingOptions2.IndentBlock, CSharpEditorResources.Indent_block_contents, editorConfigOptions, visualStudioOptions, updaterService, FileName); + yield return WhitespaceSetting.Create(CSharpFormattingOptions2.IndentBraces, CSharpEditorResources.Indent_open_and_close_braces, editorConfigOptions, visualStudioOptions, updaterService, FileName); + yield return WhitespaceSetting.Create(CSharpFormattingOptions2.IndentSwitchCaseSection, CSharpEditorResources.Indent_case_contents, editorConfigOptions, visualStudioOptions, updaterService, FileName); + yield return WhitespaceSetting.Create(CSharpFormattingOptions2.IndentSwitchCaseSectionWhenBlock, CSharpEditorResources.Indent_case_contents_when_block, editorConfigOptions, visualStudioOptions, updaterService, FileName); + yield return WhitespaceSetting.Create(CSharpFormattingOptions2.IndentSwitchSection, CSharpEditorResources.Indent_case_labels, editorConfigOptions, visualStudioOptions, updaterService, FileName); + yield return WhitespaceSetting.Create(CSharpFormattingOptions2.LabelPositioning, CSharpEditorResources.Label_Indentation, editorConfigOptions, visualStudioOptions, updaterService, FileName); } - private IEnumerable GetWrappingOptions(AnalyzerConfigOptions editorConfigOptions, OptionSet visualStudioOptions, OptionUpdater updaterService) + private IEnumerable GetWrappingOptions(AnalyzerConfigOptions editorConfigOptions, OptionSet visualStudioOptions, OptionUpdater updaterService) { - yield return FormattingSetting.Create(CSharpFormattingOptions2.WrappingPreserveSingleLine, CSharpEditorResources.Leave_block_on_single_line, editorConfigOptions, visualStudioOptions, updaterService, FileName); - yield return FormattingSetting.Create(CSharpFormattingOptions2.WrappingKeepStatementsOnSingleLine, CSharpEditorResources.Leave_statements_and_member_declarations_on_the_same_line, editorConfigOptions, visualStudioOptions, updaterService, FileName); + yield return WhitespaceSetting.Create(CSharpFormattingOptions2.WrappingPreserveSingleLine, CSharpEditorResources.Leave_block_on_single_line, editorConfigOptions, visualStudioOptions, updaterService, FileName); + yield return WhitespaceSetting.Create(CSharpFormattingOptions2.WrappingKeepStatementsOnSingleLine, CSharpEditorResources.Leave_statements_and_member_declarations_on_the_same_line, editorConfigOptions, visualStudioOptions, updaterService, FileName); } } } diff --git a/src/EditorFeatures/CSharp/EditorConfigSettings/DataProvider/Formatting/CSharpFormattingSettingsProviderFactory.cs b/src/EditorFeatures/CSharp/EditorConfigSettings/DataProvider/Whitespace/CSharpWhitespaceSettingsProviderFactory.cs similarity index 69% rename from src/EditorFeatures/CSharp/EditorConfigSettings/DataProvider/Formatting/CSharpFormattingSettingsProviderFactory.cs rename to src/EditorFeatures/CSharp/EditorConfigSettings/DataProvider/Whitespace/CSharpWhitespaceSettingsProviderFactory.cs index 543617276493a..d8bf344b4f9a7 100644 --- a/src/EditorFeatures/CSharp/EditorConfigSettings/DataProvider/Formatting/CSharpFormattingSettingsProviderFactory.cs +++ b/src/EditorFeatures/CSharp/EditorConfigSettings/DataProvider/Whitespace/CSharpWhitespaceSettingsProviderFactory.cs @@ -7,21 +7,21 @@ using Microsoft.CodeAnalysis.Editor.EditorConfigSettings.DataProvider; using Microsoft.CodeAnalysis.Editor.EditorConfigSettings.Updater; -namespace Microsoft.VisualStudio.LanguageServices.CSharp.EditorConfigSettings.DataProvider.Formatting +namespace Microsoft.VisualStudio.LanguageServices.CSharp.EditorConfigSettings.DataProvider.Whitespace { - internal class CSharpFormattingSettingsProviderFactory : ILanguageSettingsProviderFactory + internal class CSharpWhitespaceSettingsProviderFactory : ILanguageSettingsProviderFactory { private readonly Workspace _workspace; - public CSharpFormattingSettingsProviderFactory(Workspace workspace) + public CSharpWhitespaceSettingsProviderFactory(Workspace workspace) { _workspace = workspace; } - public ISettingsProvider GetForFile(string filePath) + public ISettingsProvider GetForFile(string filePath) { var updaterService = new OptionUpdater(_workspace, filePath); - return new CSharpFormattingSettingsProvider(filePath, updaterService, _workspace); + return new CSharpWhitespaceSettingsProvider(filePath, updaterService, _workspace); } } } diff --git a/src/EditorFeatures/CSharpTest/EditorConfigSettings/Aggregator/SettingsAggregatorTests.cs b/src/EditorFeatures/CSharpTest/EditorConfigSettings/Aggregator/SettingsAggregatorTests.cs index 42691dca0a0a9..14e5707d42a93 100644 --- a/src/EditorFeatures/CSharpTest/EditorConfigSettings/Aggregator/SettingsAggregatorTests.cs +++ b/src/EditorFeatures/CSharpTest/EditorConfigSettings/Aggregator/SettingsAggregatorTests.cs @@ -48,6 +48,6 @@ private static void TestGettingProvider() public void TestGettingAnalyzerProvider() => TestGettingProvider(); [Fact, Trait(Traits.Feature, Traits.Features.EditorConfigUI)] - public void TestGettingFormattingProvider() => TestGettingProvider(); + public void TestGettingWhitespaceProvider() => TestGettingProvider(); } } diff --git a/src/EditorFeatures/CSharpTest/EditorConfigSettings/DataProvider/DataProviderTests.cs b/src/EditorFeatures/CSharpTest/EditorConfigSettings/DataProvider/DataProviderTests.cs index 5bc456ab6687f..e28bb02dee185 100644 --- a/src/EditorFeatures/CSharpTest/EditorConfigSettings/DataProvider/DataProviderTests.cs +++ b/src/EditorFeatures/CSharpTest/EditorConfigSettings/DataProvider/DataProviderTests.cs @@ -67,10 +67,10 @@ public void TestGettingCodeStyleSettingsProvider() } [Fact, Trait(Traits.Feature, Traits.Features.EditorConfigUI)] - public void TestGettingFormattingSettingsProvider() + public void TestGettingWhitespaceSettingsProvider() { - TestGettingSettingsProviderFromWorkspace(); - TestGettingSettingsProviderFromLanguageService(); + TestGettingSettingsProviderFromWorkspace(); + TestGettingSettingsProviderFromLanguageService(); } [Fact, Trait(Traits.Feature, Traits.Features.EditorConfigUI)] @@ -112,9 +112,9 @@ public void TestGettingCodeStyleSettingsProviderLanguageServiceAsync() } [Fact, Trait(Traits.Feature, Traits.Features.EditorConfigUI)] - public void TestGettingFormattingSettingProviderWorkspaceServiceAsync() + public void TestGettingWhitespaceSettingProviderWorkspaceServiceAsync() { - var settingsProviderFactory = GettingSettingsProviderFactoryFromWorkspace(); + var settingsProviderFactory = GettingSettingsProviderFactoryFromWorkspace(); var settingsProvider = settingsProviderFactory.GetForFile("/a/b/config"); var model = new TestViewModel(); settingsProvider.RegisterViewModel(model); @@ -123,9 +123,9 @@ public void TestGettingFormattingSettingProviderWorkspaceServiceAsync() } [Fact, Trait(Traits.Feature, Traits.Features.EditorConfigUI)] - public void TestGettingFormattingSettingProviderLanguageServiceAsync() + public void TestGettingWhitespaceSettingProviderLanguageServiceAsync() { - var settingsProviderFactory = GettingSettingsProviderFactoryFromLanguageService(LanguageNames.CSharp); + var settingsProviderFactory = GettingSettingsProviderFactoryFromLanguageService(LanguageNames.CSharp); var settingsProvider = settingsProviderFactory.GetForFile("/a/b/config"); var model = new TestViewModel(); settingsProvider.RegisterViewModel(model); diff --git a/src/EditorFeatures/CSharpTest/EditorConfigSettings/Updater/SettingsUpdaterTests.cs b/src/EditorFeatures/CSharpTest/EditorConfigSettings/Updater/SettingsUpdaterTests.cs index 627de569da592..97604f9d5d4f5 100644 --- a/src/EditorFeatures/CSharpTest/EditorConfigSettings/Updater/SettingsUpdaterTests.cs +++ b/src/EditorFeatures/CSharpTest/EditorConfigSettings/Updater/SettingsUpdaterTests.cs @@ -364,11 +364,11 @@ public async Task TestCodeStyleSettingUpdaterService() } [Fact, Trait(Traits.Feature, Traits.Features.EditorConfigUI)] - public async Task TestFormattingSettingUpdaterService() + public async Task TestWhitespaceSettingUpdaterService() { var workspace = CreateWorkspaceWithProjectAndDocuments(); var updater = new OptionUpdater(workspace, "/a/b/config"); - var setting = FormattingSetting.Create(CSharpFormattingOptions2.NewLineForElse, "", TestAnalyzerConfigOptions.Instance, workspace.Options, updater, null!); + var setting = WhitespaceSetting.Create(CSharpFormattingOptions2.NewLineForElse, "", TestAnalyzerConfigOptions.Instance, workspace.Options, updater, null!); setting.SetValue(false); var updates = await updater.GetChangedEditorConfigAsync(default); var update = Assert.Single(updates); diff --git a/src/EditorFeatures/Core/EditorConfigSettings/Aggregator/SettingsAggregator.cs b/src/EditorFeatures/Core/EditorConfigSettings/Aggregator/SettingsAggregator.cs index 99cdba9265e4d..b27ae0c543282 100644 --- a/src/EditorFeatures/Core/EditorConfigSettings/Aggregator/SettingsAggregator.cs +++ b/src/EditorFeatures/Core/EditorConfigSettings/Aggregator/SettingsAggregator.cs @@ -15,14 +15,14 @@ internal partial class SettingsAggregator : ISettingsAggregator { private readonly Workspace _workspace; private readonly ISettingsProviderFactory _analyzerProvider; - private ISettingsProviderFactory _formattingProvider; + private ISettingsProviderFactory _whitespaceProvider; private ISettingsProviderFactory _codeStyleProvider; public SettingsAggregator(Workspace workspace) { _workspace = workspace; _workspace.WorkspaceChanged += UpdateProviders; - _formattingProvider = GetOptionsProviderFactory(_workspace); + _whitespaceProvider = GetOptionsProviderFactory(_workspace); _codeStyleProvider = GetOptionsProviderFactory(_workspace); _analyzerProvider = GetOptionsProviderFactory(_workspace); } @@ -39,7 +39,7 @@ private void UpdateProviders(object? sender, WorkspaceChangeEventArgs e) case WorkspaceChangeKind.ProjectAdded: case WorkspaceChangeKind.ProjectRemoved: case WorkspaceChangeKind.ProjectChanged: - _formattingProvider = GetOptionsProviderFactory(_workspace); + _whitespaceProvider = GetOptionsProviderFactory(_workspace); _codeStyleProvider = GetOptionsProviderFactory(_workspace); break; default: @@ -54,9 +54,9 @@ private void UpdateProviders(object? sender, WorkspaceChangeEventArgs e) return (ISettingsProvider)_analyzerProvider.GetForFile(fileName); } - if (typeof(TData) == typeof(FormattingSetting)) + if (typeof(TData) == typeof(WhitespaceSetting)) { - return (ISettingsProvider)_formattingProvider.GetForFile(fileName); + return (ISettingsProvider)_whitespaceProvider.GetForFile(fileName); } if (typeof(TData) == typeof(CodeStyleSetting)) diff --git a/src/EditorFeatures/Core/EditorConfigSettings/Data/Formatting/PerLanguageFormattingSetting.cs b/src/EditorFeatures/Core/EditorConfigSettings/Data/Whitespace/PerLanguageWhitespaceSetting.cs similarity index 94% rename from src/EditorFeatures/Core/EditorConfigSettings/Data/Formatting/PerLanguageFormattingSetting.cs rename to src/EditorFeatures/Core/EditorConfigSettings/Data/Whitespace/PerLanguageWhitespaceSetting.cs index 5e13ed1792955..3079c44230617 100644 --- a/src/EditorFeatures/Core/EditorConfigSettings/Data/Formatting/PerLanguageFormattingSetting.cs +++ b/src/EditorFeatures/Core/EditorConfigSettings/Data/Whitespace/PerLanguageWhitespaceSetting.cs @@ -9,7 +9,7 @@ namespace Microsoft.CodeAnalysis.Editor.EditorConfigSettings.Data { - internal sealed class PerLanguageFormattingSetting : FormattingSetting + internal sealed class PerLanguageWhitespaceSetting : WhitespaceSetting where T : notnull { private bool _isValueSet; @@ -46,7 +46,7 @@ private set private readonly AnalyzerConfigOptions _editorConfigOptions; private readonly OptionSet _visualStudioOptions; - public PerLanguageFormattingSetting(PerLanguageOption2 option, + public PerLanguageWhitespaceSetting(PerLanguageOption2 option, string description, AnalyzerConfigOptions editorConfigOptions, OptionSet visualStudioOptions, diff --git a/src/EditorFeatures/Core/EditorConfigSettings/Data/Formatting/FormattingSetting.cs b/src/EditorFeatures/Core/EditorConfigSettings/Data/Whitespace/WhitespaceSetting.cs similarity index 89% rename from src/EditorFeatures/Core/EditorConfigSettings/Data/Formatting/FormattingSetting.cs rename to src/EditorFeatures/Core/EditorConfigSettings/Data/Whitespace/WhitespaceSetting.cs index c632477002923..00170ee23bec9 100644 --- a/src/EditorFeatures/Core/EditorConfigSettings/Data/Formatting/FormattingSetting.cs +++ b/src/EditorFeatures/Core/EditorConfigSettings/Data/Whitespace/WhitespaceSetting.cs @@ -9,12 +9,12 @@ namespace Microsoft.CodeAnalysis.Editor.EditorConfigSettings.Data { - internal abstract class FormattingSetting + internal abstract class WhitespaceSetting { protected OptionUpdater Updater { get; } protected string? Language { get; } - protected FormattingSetting(string description, OptionUpdater updater, SettingLocation location, string? language = null) + protected WhitespaceSetting(string description, OptionUpdater updater, SettingLocation location, string? language = null) { Description = description ?? throw new ArgumentNullException(nameof(description)); Updater = updater; @@ -31,7 +31,7 @@ protected FormattingSetting(string description, OptionUpdater updater, SettingLo public abstract bool IsDefinedInEditorConfig { get; } public SettingLocation Location { get; protected set; } - public static PerLanguageFormattingSetting Create(PerLanguageOption2 option, + public static PerLanguageWhitespaceSetting Create(PerLanguageOption2 option, string description, AnalyzerConfigOptions editorConfigOptions, OptionSet visualStudioOptions, @@ -39,13 +39,12 @@ public static PerLanguageFormattingSetting Create(PerLanguageO string fileName) where TOption : notnull { - var isDefinedInEditorConfig = editorConfigOptions.TryGetEditorConfigOption(option, out _); var location = new SettingLocation(isDefinedInEditorConfig ? LocationKind.EditorConfig : LocationKind.VisualStudio, fileName); - return new PerLanguageFormattingSetting(option, description, editorConfigOptions, visualStudioOptions, updater, location); + return new PerLanguageWhitespaceSetting(option, description, editorConfigOptions, visualStudioOptions, updater, location); } - public static FormattingSetting Create(Option2 option, + public static WhitespaceSetting Create(Option2 option, string description, AnalyzerConfigOptions editorConfigOptions, OptionSet visualStudioOptions, @@ -55,7 +54,7 @@ public static FormattingSetting Create(Option2 option { var isDefinedInEditorConfig = editorConfigOptions.TryGetEditorConfigOption(option, out _); var location = new SettingLocation(isDefinedInEditorConfig ? LocationKind.EditorConfig : LocationKind.VisualStudio, fileName); - return new FormattingSetting(option, description, editorConfigOptions, visualStudioOptions, updater, location); + return new WhitespaceSetting(option, description, editorConfigOptions, visualStudioOptions, updater, location); } } } diff --git a/src/EditorFeatures/Core/EditorConfigSettings/Data/Formatting/FormattingSetting`1.cs b/src/EditorFeatures/Core/EditorConfigSettings/Data/Whitespace/WhitespaceSetting`1.cs similarity index 95% rename from src/EditorFeatures/Core/EditorConfigSettings/Data/Formatting/FormattingSetting`1.cs rename to src/EditorFeatures/Core/EditorConfigSettings/Data/Whitespace/WhitespaceSetting`1.cs index 4f7a19c632e05..c5e0cb7d2c5ac 100644 --- a/src/EditorFeatures/Core/EditorConfigSettings/Data/Formatting/FormattingSetting`1.cs +++ b/src/EditorFeatures/Core/EditorConfigSettings/Data/Whitespace/WhitespaceSetting`1.cs @@ -9,7 +9,7 @@ namespace Microsoft.CodeAnalysis.Editor.EditorConfigSettings.Data { - internal sealed class FormattingSetting : FormattingSetting + internal sealed class WhitespaceSetting : WhitespaceSetting where T : notnull { public override bool IsDefinedInEditorConfig => _options.TryGetEditorConfigOption(_option, out _); @@ -53,7 +53,7 @@ private set private readonly AnalyzerConfigOptions _options; private readonly OptionSet _visualStudioOptions; - public FormattingSetting(Option2 option, + public WhitespaceSetting(Option2 option, string description, AnalyzerConfigOptions options, OptionSet visualStudioOptions, diff --git a/src/EditorFeatures/Core/EditorConfigSettings/DataProvider/Formatting/CommonFormattingSettingsProvider.cs b/src/EditorFeatures/Core/EditorConfigSettings/DataProvider/Whitespace/CommonWhitespaceSettingsProvider.cs similarity index 74% rename from src/EditorFeatures/Core/EditorConfigSettings/DataProvider/Formatting/CommonFormattingSettingsProvider.cs rename to src/EditorFeatures/Core/EditorConfigSettings/DataProvider/Whitespace/CommonWhitespaceSettingsProvider.cs index 9db29a0eb4613..29707242c85dc 100644 --- a/src/EditorFeatures/Core/EditorConfigSettings/DataProvider/Formatting/CommonFormattingSettingsProvider.cs +++ b/src/EditorFeatures/Core/EditorConfigSettings/DataProvider/Whitespace/CommonWhitespaceSettingsProvider.cs @@ -10,11 +10,11 @@ using Microsoft.CodeAnalysis.Formatting; using Microsoft.CodeAnalysis.Options; -namespace Microsoft.CodeAnalysis.Editor.EditorConfigSettings.DataProvider.Formatting +namespace Microsoft.CodeAnalysis.Editor.EditorConfigSettings.DataProvider.Whitespace { - internal class CommonFormattingSettingsProvider : SettingsProviderBase + internal class CommonWhitespaceSettingsProvider : SettingsProviderBase { - public CommonFormattingSettingsProvider(string fileName, OptionUpdater settingsUpdater, Workspace workspace) + public CommonWhitespaceSettingsProvider(string fileName, OptionUpdater settingsUpdater, Workspace workspace) : base(fileName, settingsUpdater, workspace) { Update(); @@ -26,13 +26,13 @@ protected override void UpdateOptions(AnalyzerConfigOptions editorConfigOptions, AddRange(defaultOptions); } - private IEnumerable GetDefaultOptions(AnalyzerConfigOptions editorConfigOptions, OptionSet visualStudioOptions, OptionUpdater updater) + private IEnumerable GetDefaultOptions(AnalyzerConfigOptions editorConfigOptions, OptionSet visualStudioOptions, OptionUpdater updater) { - yield return FormattingSetting.Create(FormattingOptions2.UseTabs, EditorFeaturesResources.Use_Tabs, editorConfigOptions, visualStudioOptions, updater, FileName); - yield return FormattingSetting.Create(FormattingOptions2.TabSize, EditorFeaturesResources.Tab_Size, editorConfigOptions, visualStudioOptions, updater, FileName); - yield return FormattingSetting.Create(FormattingOptions2.IndentationSize, EditorFeaturesResources.Indentation_Size, editorConfigOptions, visualStudioOptions, updater, FileName); - yield return FormattingSetting.Create(FormattingOptions2.NewLine, EditorFeaturesResources.New_Line, editorConfigOptions, visualStudioOptions, updater, FileName); - yield return FormattingSetting.Create(FormattingOptions2.InsertFinalNewLine, EditorFeaturesResources.Insert_Final_Newline, editorConfigOptions, visualStudioOptions, updater, FileName); + yield return WhitespaceSetting.Create(FormattingOptions2.UseTabs, EditorFeaturesResources.Use_Tabs, editorConfigOptions, visualStudioOptions, updater, FileName); + yield return WhitespaceSetting.Create(FormattingOptions2.TabSize, EditorFeaturesResources.Tab_Size, editorConfigOptions, visualStudioOptions, updater, FileName); + yield return WhitespaceSetting.Create(FormattingOptions2.IndentationSize, EditorFeaturesResources.Indentation_Size, editorConfigOptions, visualStudioOptions, updater, FileName); + yield return WhitespaceSetting.Create(FormattingOptions2.NewLine, EditorFeaturesResources.New_Line, editorConfigOptions, visualStudioOptions, updater, FileName); + yield return WhitespaceSetting.Create(FormattingOptions2.InsertFinalNewLine, EditorFeaturesResources.Insert_Final_Newline, editorConfigOptions, visualStudioOptions, updater, FileName); } } } diff --git a/src/EditorFeatures/Core/EditorConfigSettings/DataProvider/Formatting/CommonFormattingSettingsProviderFactory.cs b/src/EditorFeatures/Core/EditorConfigSettings/DataProvider/Whitespace/CommonWhitespaceSettingsProviderFactory.cs similarity index 63% rename from src/EditorFeatures/Core/EditorConfigSettings/DataProvider/Formatting/CommonFormattingSettingsProviderFactory.cs rename to src/EditorFeatures/Core/EditorConfigSettings/DataProvider/Whitespace/CommonWhitespaceSettingsProviderFactory.cs index 21d130c599f42..17fed30b03dbc 100644 --- a/src/EditorFeatures/Core/EditorConfigSettings/DataProvider/Formatting/CommonFormattingSettingsProviderFactory.cs +++ b/src/EditorFeatures/Core/EditorConfigSettings/DataProvider/Whitespace/CommonWhitespaceSettingsProviderFactory.cs @@ -5,16 +5,16 @@ using Microsoft.CodeAnalysis.Editor.EditorConfigSettings.Data; using Microsoft.CodeAnalysis.Editor.EditorConfigSettings.Updater; -namespace Microsoft.CodeAnalysis.Editor.EditorConfigSettings.DataProvider.Formatting +namespace Microsoft.CodeAnalysis.Editor.EditorConfigSettings.DataProvider.Whitespace { - internal class CommonFormattingSettingsProviderFactory : IWorkspaceSettingsProviderFactory + internal class CommonWhitespaceSettingsProviderFactory : IWorkspaceSettingsProviderFactory { private readonly Workspace _workspace; - public CommonFormattingSettingsProviderFactory(Workspace workspace) => _workspace = workspace; + public CommonWhitespaceSettingsProviderFactory(Workspace workspace) => _workspace = workspace; - public ISettingsProvider GetForFile(string filePath) - => new CommonFormattingSettingsProvider(filePath, new OptionUpdater(_workspace, filePath), _workspace); + public ISettingsProvider GetForFile(string filePath) + => new CommonWhitespaceSettingsProvider(filePath, new OptionUpdater(_workspace, filePath), _workspace); } } diff --git a/src/EditorFeatures/Core/EditorConfigSettings/DataProvider/Formatting/CommonFormattingSettingsWorkspaceServiceFactory.cs b/src/EditorFeatures/Core/EditorConfigSettings/DataProvider/Whitespace/CommonWhitespaceSettingsWorkspaceServiceFactory.cs similarity index 75% rename from src/EditorFeatures/Core/EditorConfigSettings/DataProvider/Formatting/CommonFormattingSettingsWorkspaceServiceFactory.cs rename to src/EditorFeatures/Core/EditorConfigSettings/DataProvider/Whitespace/CommonWhitespaceSettingsWorkspaceServiceFactory.cs index 878bd1198987d..44a776392c08e 100644 --- a/src/EditorFeatures/Core/EditorConfigSettings/DataProvider/Formatting/CommonFormattingSettingsWorkspaceServiceFactory.cs +++ b/src/EditorFeatures/Core/EditorConfigSettings/DataProvider/Whitespace/CommonWhitespaceSettingsWorkspaceServiceFactory.cs @@ -8,16 +8,16 @@ using Microsoft.CodeAnalysis.Host; using Microsoft.CodeAnalysis.Host.Mef; -namespace Microsoft.CodeAnalysis.Editor.EditorConfigSettings.DataProvider.Formatting +namespace Microsoft.CodeAnalysis.Editor.EditorConfigSettings.DataProvider.Whitespace { - [ExportWorkspaceServiceFactory(typeof(IWorkspaceSettingsProviderFactory)), Shared] - internal class CommonFormattingSettingsWorkspaceServiceFactory : IWorkspaceServiceFactory + [ExportWorkspaceServiceFactory(typeof(IWorkspaceSettingsProviderFactory)), Shared] + internal class CommonWhitespaceSettingsWorkspaceServiceFactory : IWorkspaceServiceFactory { [ImportingConstructor] [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)] - public CommonFormattingSettingsWorkspaceServiceFactory() { } + public CommonWhitespaceSettingsWorkspaceServiceFactory() { } public IWorkspaceService CreateService(HostWorkspaceServices workspaceServices) - => new CommonFormattingSettingsProviderFactory(workspaceServices.Workspace); + => new CommonWhitespaceSettingsProviderFactory(workspaceServices.Workspace); } } diff --git a/src/VisualStudio/CSharp/Impl/EditorConfigSettings/BinaryOperatorSpacingOptionsViewModel.cs b/src/VisualStudio/CSharp/Impl/EditorConfigSettings/BinaryOperatorSpacingOptionsViewModel.cs index 18186ed974e12..51a942ab7e57b 100644 --- a/src/VisualStudio/CSharp/Impl/EditorConfigSettings/BinaryOperatorSpacingOptionsViewModel.cs +++ b/src/VisualStudio/CSharp/Impl/EditorConfigSettings/BinaryOperatorSpacingOptionsViewModel.cs @@ -12,9 +12,9 @@ namespace Microsoft.VisualStudio.LanguageServices.CSharp.EditorConfigSettings { internal class BinaryOperatorSpacingOptionsViewModel : EnumSettingViewModel { - private readonly FormattingSetting _setting; + private readonly WhitespaceSetting _setting; - public BinaryOperatorSpacingOptionsViewModel(FormattingSetting setting) + public BinaryOperatorSpacingOptionsViewModel(WhitespaceSetting setting) { _setting = setting; } diff --git a/src/VisualStudio/CSharp/Impl/EditorConfigSettings/BinaryOperatorSpacingOptionsViewModelFactory.cs b/src/VisualStudio/CSharp/Impl/EditorConfigSettings/BinaryOperatorSpacingOptionsViewModelFactory.cs index 6a5085101a91b..165992048c432 100644 --- a/src/VisualStudio/CSharp/Impl/EditorConfigSettings/BinaryOperatorSpacingOptionsViewModelFactory.cs +++ b/src/VisualStudio/CSharp/Impl/EditorConfigSettings/BinaryOperatorSpacingOptionsViewModelFactory.cs @@ -21,7 +21,7 @@ public BinaryOperatorSpacingOptionsViewModelFactory() { } - public IEnumSettingViewModel CreateViewModel(FormattingSetting setting) + public IEnumSettingViewModel CreateViewModel(WhitespaceSetting setting) { return new BinaryOperatorSpacingOptionsViewModel(setting); } diff --git a/src/VisualStudio/CSharp/Impl/EditorConfigSettings/LabelPositionOptionsViewModel.cs b/src/VisualStudio/CSharp/Impl/EditorConfigSettings/LabelPositionOptionsViewModel.cs index bbbfcda4f07d9..6be10a3f55edf 100644 --- a/src/VisualStudio/CSharp/Impl/EditorConfigSettings/LabelPositionOptionsViewModel.cs +++ b/src/VisualStudio/CSharp/Impl/EditorConfigSettings/LabelPositionOptionsViewModel.cs @@ -24,7 +24,7 @@ public LabelPositionOptionsViewModelFactory() { } - public IEnumSettingViewModel CreateViewModel(FormattingSetting setting) + public IEnumSettingViewModel CreateViewModel(WhitespaceSetting setting) { return new LabelPositionOptionsViewModel(setting); } @@ -35,9 +35,9 @@ public bool IsSupported(OptionKey2 key) internal class LabelPositionOptionsViewModel : EnumSettingViewModel { - private readonly FormattingSetting _setting; + private readonly WhitespaceSetting _setting; - public LabelPositionOptionsViewModel(FormattingSetting setting) + public LabelPositionOptionsViewModel(WhitespaceSetting setting) { _setting = setting; } diff --git a/src/VisualStudio/Core/Def/EditorConfigSettings/Common/ColumnDefinitions.cs b/src/VisualStudio/Core/Def/EditorConfigSettings/Common/ColumnDefinitions.cs index c01a90d7f5b81..d2dd4a8abebb7 100644 --- a/src/VisualStudio/Core/Def/EditorConfigSettings/Common/ColumnDefinitions.cs +++ b/src/VisualStudio/Core/Def/EditorConfigSettings/Common/ColumnDefinitions.cs @@ -31,9 +31,9 @@ internal static class CodeStyle public const string Location = Prefix + CodeStylePrefix + "location"; } - internal static class Formatting + internal static class Whitespace { - private const string FormattingPrefix = "Formatting."; + private const string FormattingPrefix = "whitespace."; public const string Category = Prefix + FormattingPrefix + "categoryname"; public const string Description = Prefix + FormattingPrefix + "descriptionname"; public const string Value = Prefix + FormattingPrefix + "valuename"; diff --git a/src/VisualStudio/Core/Def/EditorConfigSettings/Common/IEnumSettingViewModelFactory.cs b/src/VisualStudio/Core/Def/EditorConfigSettings/Common/IEnumSettingViewModelFactory.cs index 5e1ba1fe2c235..2a04a34fa4150 100644 --- a/src/VisualStudio/Core/Def/EditorConfigSettings/Common/IEnumSettingViewModelFactory.cs +++ b/src/VisualStudio/Core/Def/EditorConfigSettings/Common/IEnumSettingViewModelFactory.cs @@ -10,6 +10,6 @@ namespace Microsoft.VisualStudio.LanguageServices.EditorConfigSettings.Common internal interface IEnumSettingViewModelFactory { bool IsSupported(OptionKey2 key); - IEnumSettingViewModel CreateViewModel(FormattingSetting setting); + IEnumSettingViewModel CreateViewModel(WhitespaceSetting setting); } } diff --git a/src/VisualStudio/Core/Def/EditorConfigSettings/SettingsEditorControl.xaml b/src/VisualStudio/Core/Def/EditorConfigSettings/SettingsEditorControl.xaml index 4e0c57c19e250..9560849a9ca4a 100644 --- a/src/VisualStudio/Core/Def/EditorConfigSettings/SettingsEditorControl.xaml +++ b/src/VisualStudio/Core/Def/EditorConfigSettings/SettingsEditorControl.xaml @@ -18,7 +18,7 @@ - + diff --git a/src/VisualStudio/Core/Def/EditorConfigSettings/SettingsEditorControl.xaml.cs b/src/VisualStudio/Core/Def/EditorConfigSettings/SettingsEditorControl.xaml.cs index 2e1bbac25a334..79f7e4dbe4796 100644 --- a/src/VisualStudio/Core/Def/EditorConfigSettings/SettingsEditorControl.xaml.cs +++ b/src/VisualStudio/Core/Def/EditorConfigSettings/SettingsEditorControl.xaml.cs @@ -20,7 +20,7 @@ namespace Microsoft.VisualStudio.LanguageServices.EditorConfigSettings /// internal partial class SettingsEditorControl : UserControl { - private readonly ISettingsEditorView _formattingView; + private readonly ISettingsEditorView _whitespaceView; private readonly ISettingsEditorView _codeStyleView; private readonly ISettingsEditorView _analyzerSettingsView; private readonly Workspace _workspace; @@ -28,11 +28,11 @@ internal partial class SettingsEditorControl : UserControl private readonly IThreadingContext _threadingContext; private readonly EditorTextUpdater _textUpdater; - public static string Formatting => ServicesVSResources.Formatting; + public static string Whitespace => ServicesVSResources.Whitespace; public static string CodeStyle => ServicesVSResources.Code_Style; public static string Analyzers => ServicesVSResources.Analyzers; - public SettingsEditorControl(ISettingsEditorView formattingView, + public SettingsEditorControl(ISettingsEditorView whitespaceView, ISettingsEditorView codeStyleView, ISettingsEditorView analyzerSettingsView, Workspace workspace, @@ -47,8 +47,8 @@ public SettingsEditorControl(ISettingsEditorView formattingView, _filepath = filepath; _threadingContext = threadingContext; _textUpdater = new EditorTextUpdater(editorAdaptersFactoryService, textLines); - _formattingView = formattingView; - FormattingTab.Content = _formattingView.SettingControl; + _whitespaceView = whitespaceView; + WhitespaceTab.Content = _whitespaceView.SettingControl; _codeStyleView = codeStyleView; CodeStyleTab.Content = _codeStyleView.SettingControl; _analyzerSettingsView = analyzerSettingsView; @@ -73,7 +73,7 @@ internal void SynchronizeSettings() _threadingContext.JoinableTaskFactory.Run(async () => { var originalText = await analyzerConfigDocument.GetTextAsync(default).ConfigureAwait(false); - var updatedText = await _formattingView.UpdateEditorConfigAsync(originalText).ConfigureAwait(false); + var updatedText = await _whitespaceView.UpdateEditorConfigAsync(originalText).ConfigureAwait(false); updatedText = await _codeStyleView.UpdateEditorConfigAsync(updatedText).ConfigureAwait(false); updatedText = await _analyzerSettingsView.UpdateEditorConfigAsync(updatedText).ConfigureAwait(false); _textUpdater.UpdateText(updatedText.GetTextChanges(originalText)); @@ -83,14 +83,14 @@ internal void SynchronizeSettings() internal IWpfTableControl[] GetTableControls() => new[] { - _formattingView.TableControl, + _whitespaceView.TableControl, _codeStyleView.TableControl, _analyzerSettingsView.TableControl, }; internal void OnClose() { - _formattingView.OnClose(); + _whitespaceView.OnClose(); _codeStyleView.OnClose(); _analyzerSettingsView.OnClose(); } diff --git a/src/VisualStudio/Core/Def/EditorConfigSettings/SettingsEditorPane.cs b/src/VisualStudio/Core/Def/EditorConfigSettings/SettingsEditorPane.cs index 89268b2a5dd0f..472af983c6853 100644 --- a/src/VisualStudio/Core/Def/EditorConfigSettings/SettingsEditorPane.cs +++ b/src/VisualStudio/Core/Def/EditorConfigSettings/SettingsEditorPane.cs @@ -17,8 +17,8 @@ using Microsoft.VisualStudio.LanguageServices.EditorConfigSettings.Analyzers.ViewModel; using Microsoft.VisualStudio.LanguageServices.EditorConfigSettings.CodeStyle.View; using Microsoft.VisualStudio.LanguageServices.EditorConfigSettings.CodeStyle.ViewModel; -using Microsoft.VisualStudio.LanguageServices.EditorConfigSettings.Formatting.View; -using Microsoft.VisualStudio.LanguageServices.EditorConfigSettings.Formatting.ViewModel; +using Microsoft.VisualStudio.LanguageServices.EditorConfigSettings.Whitespace.View; +using Microsoft.VisualStudio.LanguageServices.EditorConfigSettings.Whitespace.ViewModel; using Microsoft.VisualStudio.OLE.Interop; using Microsoft.VisualStudio.PlatformUI; using Microsoft.VisualStudio.Shell; @@ -96,7 +96,7 @@ protected override void Initialize() // hook up our panel _control = new SettingsEditorControl( - GetFormattingView(), + GetWhitespaceView(), GetCodeStyleView(), GetAnalyzerView(), _workspace, @@ -115,16 +115,16 @@ protected override void Initialize() new EventHandler(OnViewCode), new EventHandler(OnQueryViewCode)); } - ISettingsEditorView GetFormattingView() + ISettingsEditorView GetWhitespaceView() { - var dataProvider = _settingsDataProviderService.GetSettingsProvider(_fileName); + var dataProvider = _settingsDataProviderService.GetSettingsProvider(_fileName); if (dataProvider is null) { - throw new InvalidOperationException("Unable to get formatter settings"); + throw new InvalidOperationException("Unable to get whitespace settings"); } - var viewModel = new FormattingViewModel(dataProvider, _controlProvider, _tableMangerProvider); - return new FormattingSettingsView(viewModel); + var viewModel = new WhitespaceViewModel(dataProvider, _controlProvider, _tableMangerProvider); + return new WhitespaceSettingsView(viewModel); } ISettingsEditorView GetCodeStyleView() diff --git a/src/VisualStudio/Core/Def/EditorConfigSettings/Formatting/View/ColumnDefnitions/FormattingCategoryColumnDefinition.cs b/src/VisualStudio/Core/Def/EditorConfigSettings/Whitespace/View/ColumnDefnitions/WhitespaceCategoryColumnDefinition.cs similarity index 83% rename from src/VisualStudio/Core/Def/EditorConfigSettings/Formatting/View/ColumnDefnitions/FormattingCategoryColumnDefinition.cs rename to src/VisualStudio/Core/Def/EditorConfigSettings/Whitespace/View/ColumnDefnitions/WhitespaceCategoryColumnDefinition.cs index 9b1b7ae7f4156..f00ba4a100b29 100644 --- a/src/VisualStudio/Core/Def/EditorConfigSettings/Formatting/View/ColumnDefnitions/FormattingCategoryColumnDefinition.cs +++ b/src/VisualStudio/Core/Def/EditorConfigSettings/Whitespace/View/ColumnDefnitions/WhitespaceCategoryColumnDefinition.cs @@ -9,29 +9,29 @@ using Microsoft.VisualStudio.Shell.TableControl; using Microsoft.VisualStudio.Shell.TableManager; using Microsoft.VisualStudio.Utilities; -using static Microsoft.VisualStudio.LanguageServices.EditorConfigSettings.Common.ColumnDefinitions.Formatting; +using static Microsoft.VisualStudio.LanguageServices.EditorConfigSettings.Common.ColumnDefinitions.Whitespace; -namespace Microsoft.VisualStudio.LanguageServices.EditorConfigSettings.Formatting.View.ColumnDefnitions +namespace Microsoft.VisualStudio.LanguageServices.EditorConfigSettings.Whitespace.View.ColumnDefnitions { [Export(typeof(IDefaultColumnGroup))] - [Name(nameof(FormattingCategoryGroupingSet))] // Required, name of the default group + [Name(nameof(WhitespaceCategoryGroupingSet))] // Required, name of the default group [GroupColumns(Category)] // Required, the names of the columns in the grouping - internal class FormattingCategoryGroupingSet : IDefaultColumnGroup + internal class WhitespaceCategoryGroupingSet : IDefaultColumnGroup { [ImportingConstructor] [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)] - public FormattingCategoryGroupingSet() + public WhitespaceCategoryGroupingSet() { } } [Export(typeof(ITableColumnDefinition))] [Name(Category)] - internal class FormattingCategoryColumnDefinition : TableColumnDefinitionBase + internal class WhitespaceCategoryColumnDefinition : TableColumnDefinitionBase { [ImportingConstructor] [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)] - public FormattingCategoryColumnDefinition() + public WhitespaceCategoryColumnDefinition() { } diff --git a/src/VisualStudio/Core/Def/EditorConfigSettings/Formatting/View/ColumnDefnitions/FormattingDescriptionColumnDefinition.cs b/src/VisualStudio/Core/Def/EditorConfigSettings/Whitespace/View/ColumnDefnitions/WhitespaceDescriptionColumnDefinition.cs similarity index 83% rename from src/VisualStudio/Core/Def/EditorConfigSettings/Formatting/View/ColumnDefnitions/FormattingDescriptionColumnDefinition.cs rename to src/VisualStudio/Core/Def/EditorConfigSettings/Whitespace/View/ColumnDefnitions/WhitespaceDescriptionColumnDefinition.cs index eb11d8badf6df..dc4ac473b1738 100644 --- a/src/VisualStudio/Core/Def/EditorConfigSettings/Formatting/View/ColumnDefnitions/FormattingDescriptionColumnDefinition.cs +++ b/src/VisualStudio/Core/Def/EditorConfigSettings/Whitespace/View/ColumnDefnitions/WhitespaceDescriptionColumnDefinition.cs @@ -7,17 +7,17 @@ using Microsoft.CodeAnalysis.Host.Mef; using Microsoft.VisualStudio.Shell.TableControl; using Microsoft.VisualStudio.Utilities; -using static Microsoft.VisualStudio.LanguageServices.EditorConfigSettings.Common.ColumnDefinitions.Formatting; +using static Microsoft.VisualStudio.LanguageServices.EditorConfigSettings.Common.ColumnDefinitions.Whitespace; -namespace Microsoft.VisualStudio.LanguageServices.EditorConfigSettings.Formatting.View.ColumnDefnitions +namespace Microsoft.VisualStudio.LanguageServices.EditorConfigSettings.Whitespace.View.ColumnDefnitions { [Export(typeof(ITableColumnDefinition))] [Name(Description)] - internal class FormattingDescriptionColumnDefinition : TableColumnDefinitionBase + internal class WhitespaceDescriptionColumnDefinition : TableColumnDefinitionBase { [ImportingConstructor] [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)] - public FormattingDescriptionColumnDefinition() + public WhitespaceDescriptionColumnDefinition() { } diff --git a/src/VisualStudio/Core/Def/EditorConfigSettings/Formatting/View/ColumnDefnitions/FormattingLocationColumnDefinition.cs b/src/VisualStudio/Core/Def/EditorConfigSettings/Whitespace/View/ColumnDefnitions/WhitespaceLocationColumnDefinition.cs similarity index 84% rename from src/VisualStudio/Core/Def/EditorConfigSettings/Formatting/View/ColumnDefnitions/FormattingLocationColumnDefinition.cs rename to src/VisualStudio/Core/Def/EditorConfigSettings/Whitespace/View/ColumnDefnitions/WhitespaceLocationColumnDefinition.cs index 636e6907ff0b5..d4954c37dd09c 100644 --- a/src/VisualStudio/Core/Def/EditorConfigSettings/Formatting/View/ColumnDefnitions/FormattingLocationColumnDefinition.cs +++ b/src/VisualStudio/Core/Def/EditorConfigSettings/Whitespace/View/ColumnDefnitions/WhitespaceLocationColumnDefinition.cs @@ -7,17 +7,17 @@ using Microsoft.CodeAnalysis.Host.Mef; using Microsoft.VisualStudio.Shell.TableControl; using Microsoft.VisualStudio.Utilities; -using static Microsoft.VisualStudio.LanguageServices.EditorConfigSettings.Common.ColumnDefinitions.Formatting; +using static Microsoft.VisualStudio.LanguageServices.EditorConfigSettings.Common.ColumnDefinitions.Whitespace; -namespace Microsoft.VisualStudio.LanguageServices.EditorConfigSettings.Formatting.View.ColumnDefnitions +namespace Microsoft.VisualStudio.LanguageServices.EditorConfigSettings.Whitespace.View.ColumnDefnitions { [Export(typeof(ITableColumnDefinition))] [Name(Location)] - internal class FormattingLocationColumnDefinition : TableColumnDefinitionBase + internal class WhitespaceLocationColumnDefinition : TableColumnDefinitionBase { [ImportingConstructor] [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)] - public FormattingLocationColumnDefinition() + public WhitespaceLocationColumnDefinition() { } diff --git a/src/VisualStudio/Core/Def/EditorConfigSettings/Formatting/View/ColumnDefnitions/FormattingValueColumnDefinition.cs b/src/VisualStudio/Core/Def/EditorConfigSettings/Whitespace/View/ColumnDefnitions/WhitespaceValueColumnDefinition.cs similarity index 86% rename from src/VisualStudio/Core/Def/EditorConfigSettings/Formatting/View/ColumnDefnitions/FormattingValueColumnDefinition.cs rename to src/VisualStudio/Core/Def/EditorConfigSettings/Whitespace/View/ColumnDefnitions/WhitespaceValueColumnDefinition.cs index c0c4b6a058a02..7705b19ab8ccf 100644 --- a/src/VisualStudio/Core/Def/EditorConfigSettings/Formatting/View/ColumnDefnitions/FormattingValueColumnDefinition.cs +++ b/src/VisualStudio/Core/Def/EditorConfigSettings/Whitespace/View/ColumnDefnitions/WhitespaceValueColumnDefinition.cs @@ -12,20 +12,20 @@ using Microsoft.VisualStudio.Shell.TableControl; using Microsoft.VisualStudio.Shell.TableManager; using Microsoft.VisualStudio.Utilities; -using static Microsoft.VisualStudio.LanguageServices.EditorConfigSettings.Common.ColumnDefinitions.Formatting; +using static Microsoft.VisualStudio.LanguageServices.EditorConfigSettings.Common.ColumnDefinitions.Whitespace; -namespace Microsoft.VisualStudio.LanguageServices.EditorConfigSettings.Formatting.View.ColumnDefnitions +namespace Microsoft.VisualStudio.LanguageServices.EditorConfigSettings.Whitespace.View.ColumnDefnitions { [Export(typeof(ITableColumnDefinition))] [Name(Value)] - internal class FormattingValueColumnDefinition : TableColumnDefinitionBase + internal class WhitespaceValueColumnDefinition : TableColumnDefinitionBase { private readonly IEnumerable _factories; [ImportingConstructor] [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)] - public FormattingValueColumnDefinition([ImportMany] IEnumerable factories) + public WhitespaceValueColumnDefinition([ImportMany] IEnumerable factories) { _factories = factories; } @@ -40,7 +40,7 @@ public FormattingValueColumnDefinition([ImportMany] IEnumerable /// Interaction logic for WhitespaceValueSettingControl.xaml /// - internal partial class FormattingBoolSettingView : UserControl + internal partial class WhitespaceBoolSettingView : UserControl { - private readonly FormattingSetting _setting; + private readonly WhitespaceSetting _setting; - public FormattingBoolSettingView(FormattingSetting setting) + public WhitespaceBoolSettingView(WhitespaceSetting setting) { InitializeComponent(); RootCheckBox.SetValue(AutomationProperties.NameProperty, ServicesVSResources.Value); diff --git a/src/VisualStudio/Core/Def/EditorConfigSettings/Formatting/View/FormattingSettingsView.xaml b/src/VisualStudio/Core/Def/EditorConfigSettings/Whitespace/View/WhitespaceSettingsView.xaml similarity index 82% rename from src/VisualStudio/Core/Def/EditorConfigSettings/Formatting/View/FormattingSettingsView.xaml rename to src/VisualStudio/Core/Def/EditorConfigSettings/Whitespace/View/WhitespaceSettingsView.xaml index 6e914a4f5de62..b74a9d3504e07 100644 --- a/src/VisualStudio/Core/Def/EditorConfigSettings/Formatting/View/FormattingSettingsView.xaml +++ b/src/VisualStudio/Core/Def/EditorConfigSettings/Whitespace/View/WhitespaceSettingsView.xaml @@ -1,14 +1,14 @@ - /// Interaction logic for FormattingSettingsView.xaml /// - internal partial class FormattingSettingsView : UserControl, ISettingsEditorView + internal partial class WhitespaceSettingsView : UserControl, ISettingsEditorView { private readonly IWpfSettingsEditorViewModel _viewModel; - public FormattingSettingsView(IWpfSettingsEditorViewModel viewModel) + public WhitespaceSettingsView(IWpfSettingsEditorViewModel viewModel) { InitializeComponent(); _viewModel = viewModel; TableControl = _viewModel.GetTableControl(); - FormattingTable.Child = TableControl.Control; + WhitespaceTable.Child = TableControl.Control; } public UserControl SettingControl => this; diff --git a/src/VisualStudio/Core/Def/EditorConfigSettings/Formatting/ViewModel/IndentationSizeViewModel.cs b/src/VisualStudio/Core/Def/EditorConfigSettings/Whitespace/ViewModel/IndentationSizeViewModel.cs similarity index 95% rename from src/VisualStudio/Core/Def/EditorConfigSettings/Formatting/ViewModel/IndentationSizeViewModel.cs rename to src/VisualStudio/Core/Def/EditorConfigSettings/Whitespace/ViewModel/IndentationSizeViewModel.cs index c8f750aff18cc..51345a2e03bc6 100644 --- a/src/VisualStudio/Core/Def/EditorConfigSettings/Formatting/ViewModel/IndentationSizeViewModel.cs +++ b/src/VisualStudio/Core/Def/EditorConfigSettings/Whitespace/ViewModel/IndentationSizeViewModel.cs @@ -13,7 +13,7 @@ using Microsoft.CodeAnalysis.Options; using Microsoft.VisualStudio.LanguageServices.EditorConfigSettings.Common; -namespace Microsoft.VisualStudio.LanguageServices.EditorConfigSettings.Formatting.ViewModel +namespace Microsoft.VisualStudio.LanguageServices.EditorConfigSettings.Whitespace.ViewModel { [Export(typeof(IEnumSettingViewModelFactory)), Shared] internal class IndentationSizeVViewModelFactory : IEnumSettingViewModelFactory @@ -27,7 +27,7 @@ public IndentationSizeVViewModelFactory() _key = new OptionKey2(FormattingOptions2.IndentationSize, LanguageNames.CSharp); } - public IEnumSettingViewModel CreateViewModel(FormattingSetting setting) + public IEnumSettingViewModel CreateViewModel(WhitespaceSetting setting) { return new IndentationSizeViewModel(setting); } @@ -49,9 +49,9 @@ internal enum IndentationSizeSetting internal class IndentationSizeViewModel : EnumSettingViewModel { - private readonly FormattingSetting _setting; + private readonly WhitespaceSetting _setting; - public IndentationSizeViewModel(FormattingSetting setting) + public IndentationSizeViewModel(WhitespaceSetting setting) { _setting = setting; } diff --git a/src/VisualStudio/Core/Def/EditorConfigSettings/Formatting/ViewModel/NewLineViewModel.cs b/src/VisualStudio/Core/Def/EditorConfigSettings/Whitespace/ViewModel/NewLineViewModel.cs similarity index 93% rename from src/VisualStudio/Core/Def/EditorConfigSettings/Formatting/ViewModel/NewLineViewModel.cs rename to src/VisualStudio/Core/Def/EditorConfigSettings/Whitespace/ViewModel/NewLineViewModel.cs index dc9a007825d5f..53d8930538d15 100644 --- a/src/VisualStudio/Core/Def/EditorConfigSettings/Formatting/ViewModel/NewLineViewModel.cs +++ b/src/VisualStudio/Core/Def/EditorConfigSettings/Whitespace/ViewModel/NewLineViewModel.cs @@ -13,7 +13,7 @@ using Microsoft.CodeAnalysis.Options; using Microsoft.VisualStudio.LanguageServices.EditorConfigSettings.Common; -namespace Microsoft.VisualStudio.LanguageServices.EditorConfigSettings.Formatting.ViewModel +namespace Microsoft.VisualStudio.LanguageServices.EditorConfigSettings.Whitespace.ViewModel { [Export(typeof(IEnumSettingViewModelFactory)), Shared] internal class NewLineViewModelFactory : IEnumSettingViewModelFactory @@ -27,7 +27,7 @@ public NewLineViewModelFactory() _key = new OptionKey2(FormattingOptions2.NewLine, LanguageNames.CSharp); } - public IEnumSettingViewModel CreateViewModel(FormattingSetting setting) + public IEnumSettingViewModel CreateViewModel(WhitespaceSetting setting) { return new NewLineViewModel(setting); } @@ -45,9 +45,9 @@ internal enum NewLineSetting internal class NewLineViewModel : EnumSettingViewModel { - private readonly FormattingSetting _setting; + private readonly WhitespaceSetting _setting; - public NewLineViewModel(FormattingSetting setting) + public NewLineViewModel(WhitespaceSetting setting) { _setting = setting; } diff --git a/src/VisualStudio/Core/Def/EditorConfigSettings/Formatting/ViewModel/TabSizeSettings.cs b/src/VisualStudio/Core/Def/EditorConfigSettings/Whitespace/ViewModel/TabSizeSettings.cs similarity index 93% rename from src/VisualStudio/Core/Def/EditorConfigSettings/Formatting/ViewModel/TabSizeSettings.cs rename to src/VisualStudio/Core/Def/EditorConfigSettings/Whitespace/ViewModel/TabSizeSettings.cs index ddd0594e2b312..c199459d06a6e 100644 --- a/src/VisualStudio/Core/Def/EditorConfigSettings/Formatting/ViewModel/TabSizeSettings.cs +++ b/src/VisualStudio/Core/Def/EditorConfigSettings/Whitespace/ViewModel/TabSizeSettings.cs @@ -2,7 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -namespace Microsoft.VisualStudio.LanguageServices.EditorConfigSettings.Formatting.ViewModel +namespace Microsoft.VisualStudio.LanguageServices.EditorConfigSettings.Whitespace.ViewModel { internal enum TabSizeSettings { diff --git a/src/VisualStudio/Core/Def/EditorConfigSettings/Formatting/ViewModel/TabSizeViewModel.cs b/src/VisualStudio/Core/Def/EditorConfigSettings/Whitespace/ViewModel/TabSizeViewModel.cs similarity index 93% rename from src/VisualStudio/Core/Def/EditorConfigSettings/Formatting/ViewModel/TabSizeViewModel.cs rename to src/VisualStudio/Core/Def/EditorConfigSettings/Whitespace/ViewModel/TabSizeViewModel.cs index ea51e1505a6bb..5fbc8a947b397 100644 --- a/src/VisualStudio/Core/Def/EditorConfigSettings/Formatting/ViewModel/TabSizeViewModel.cs +++ b/src/VisualStudio/Core/Def/EditorConfigSettings/Whitespace/ViewModel/TabSizeViewModel.cs @@ -8,13 +8,13 @@ using Microsoft.CodeAnalysis.Editor.EditorConfigSettings.Data; using Microsoft.VisualStudio.LanguageServices.EditorConfigSettings.Common; -namespace Microsoft.VisualStudio.LanguageServices.EditorConfigSettings.Formatting.ViewModel +namespace Microsoft.VisualStudio.LanguageServices.EditorConfigSettings.Whitespace.ViewModel { internal class TabSizeViewModel : EnumSettingViewModel { - private readonly FormattingSetting _setting; + private readonly WhitespaceSetting _setting; - public TabSizeViewModel(FormattingSetting setting) + public TabSizeViewModel(WhitespaceSetting setting) { _setting = setting; } diff --git a/src/VisualStudio/Core/Def/EditorConfigSettings/Formatting/ViewModel/TabSizeViewModelFactory.cs b/src/VisualStudio/Core/Def/EditorConfigSettings/Whitespace/ViewModel/TabSizeViewModelFactory.cs similarity index 92% rename from src/VisualStudio/Core/Def/EditorConfigSettings/Formatting/ViewModel/TabSizeViewModelFactory.cs rename to src/VisualStudio/Core/Def/EditorConfigSettings/Whitespace/ViewModel/TabSizeViewModelFactory.cs index e33d79adb8132..7a6ea97d8c4c3 100644 --- a/src/VisualStudio/Core/Def/EditorConfigSettings/Formatting/ViewModel/TabSizeViewModelFactory.cs +++ b/src/VisualStudio/Core/Def/EditorConfigSettings/Whitespace/ViewModel/TabSizeViewModelFactory.cs @@ -11,7 +11,7 @@ using Microsoft.CodeAnalysis.Options; using Microsoft.VisualStudio.LanguageServices.EditorConfigSettings.Common; -namespace Microsoft.VisualStudio.LanguageServices.EditorConfigSettings.Formatting.ViewModel +namespace Microsoft.VisualStudio.LanguageServices.EditorConfigSettings.Whitespace.ViewModel { [Export(typeof(IEnumSettingViewModelFactory)), Shared] internal class TabSizeViewModelFactory : IEnumSettingViewModelFactory @@ -25,7 +25,7 @@ public TabSizeViewModelFactory() _key = new OptionKey2(FormattingOptions2.TabSize, LanguageNames.CSharp); } - public IEnumSettingViewModel CreateViewModel(FormattingSetting setting) + public IEnumSettingViewModel CreateViewModel(WhitespaceSetting setting) { return new TabSizeViewModel(setting); } diff --git a/src/VisualStudio/Core/Def/EditorConfigSettings/Formatting/ViewModel/FormattingViewModel.SettingsEntriesSnapshot.cs b/src/VisualStudio/Core/Def/EditorConfigSettings/Whitespace/ViewModel/WhitespaceViewModel.SettingsEntriesSnapshot.cs similarity index 69% rename from src/VisualStudio/Core/Def/EditorConfigSettings/Formatting/ViewModel/FormattingViewModel.SettingsEntriesSnapshot.cs rename to src/VisualStudio/Core/Def/EditorConfigSettings/Whitespace/ViewModel/WhitespaceViewModel.SettingsEntriesSnapshot.cs index d57e981b03cee..f27e60535f55d 100644 --- a/src/VisualStudio/Core/Def/EditorConfigSettings/Formatting/ViewModel/FormattingViewModel.SettingsEntriesSnapshot.cs +++ b/src/VisualStudio/Core/Def/EditorConfigSettings/Whitespace/ViewModel/WhitespaceViewModel.SettingsEntriesSnapshot.cs @@ -7,22 +7,22 @@ using Microsoft.CodeAnalysis.Editor.EditorConfigSettings.Data; using Microsoft.VisualStudio.LanguageServices.EditorConfigSettings.Common; -namespace Microsoft.VisualStudio.LanguageServices.EditorConfigSettings.Formatting.ViewModel +namespace Microsoft.VisualStudio.LanguageServices.EditorConfigSettings.Whitespace.ViewModel { - internal partial class FormattingViewModel + internal partial class WhitespaceViewModel { - internal sealed class SettingsEntriesSnapshot : SettingsEntriesSnapshotBase + internal sealed class SettingsEntriesSnapshot : SettingsEntriesSnapshotBase { - public SettingsEntriesSnapshot(ImmutableArray data, int currentVersionNumber) : base(data, currentVersionNumber) { } + public SettingsEntriesSnapshot(ImmutableArray data, int currentVersionNumber) : base(data, currentVersionNumber) { } - protected override bool TryGetValue(FormattingSetting result, string keyName, out object? content) + protected override bool TryGetValue(WhitespaceSetting result, string keyName, out object? content) { content = keyName switch { - ColumnDefinitions.Formatting.Description => result.Description, - ColumnDefinitions.Formatting.Category => result.Category, - ColumnDefinitions.Formatting.Value => result, - ColumnDefinitions.Formatting.Location => GetLocationString(result.Location), + ColumnDefinitions.Whitespace.Description => result.Description, + ColumnDefinitions.Whitespace.Category => result.Category, + ColumnDefinitions.Whitespace.Value => result, + ColumnDefinitions.Whitespace.Location => GetLocationString(result.Location), _ => null, }; diff --git a/src/VisualStudio/Core/Def/EditorConfigSettings/Formatting/ViewModel/FormattingViewModel.SettingsSnapshotFactory.cs b/src/VisualStudio/Core/Def/EditorConfigSettings/Whitespace/ViewModel/WhitespaceViewModel.SettingsSnapshotFactory.cs similarity index 70% rename from src/VisualStudio/Core/Def/EditorConfigSettings/Formatting/ViewModel/FormattingViewModel.SettingsSnapshotFactory.cs rename to src/VisualStudio/Core/Def/EditorConfigSettings/Whitespace/ViewModel/WhitespaceViewModel.SettingsSnapshotFactory.cs index c29473e1aa092..ad6aea58ff042 100644 --- a/src/VisualStudio/Core/Def/EditorConfigSettings/Formatting/ViewModel/FormattingViewModel.SettingsSnapshotFactory.cs +++ b/src/VisualStudio/Core/Def/EditorConfigSettings/Whitespace/ViewModel/WhitespaceViewModel.SettingsSnapshotFactory.cs @@ -7,15 +7,15 @@ using Microsoft.CodeAnalysis.Editor.EditorConfigSettings.DataProvider; using Microsoft.VisualStudio.LanguageServices.EditorConfigSettings.Common; -namespace Microsoft.VisualStudio.LanguageServices.EditorConfigSettings.Formatting.ViewModel +namespace Microsoft.VisualStudio.LanguageServices.EditorConfigSettings.Whitespace.ViewModel { - internal partial class FormattingViewModel + internal partial class WhitespaceViewModel { - internal sealed class SettingsSnapshotFactory : SettingsSnapshotFactoryBase + internal sealed class SettingsSnapshotFactory : SettingsSnapshotFactoryBase { - public SettingsSnapshotFactory(ISettingsProvider data) : base(data) { } + public SettingsSnapshotFactory(ISettingsProvider data) : base(data) { } - protected override SettingsEntriesSnapshot CreateSnapshot(ImmutableArray data, int currentVersionNumber) + protected override SettingsEntriesSnapshot CreateSnapshot(ImmutableArray data, int currentVersionNumber) => new(data, currentVersionNumber); } } diff --git a/src/VisualStudio/Core/Def/EditorConfigSettings/Formatting/ViewModel/FormattingViewModel.cs b/src/VisualStudio/Core/Def/EditorConfigSettings/Whitespace/ViewModel/WhitespaceViewModel.cs similarity index 64% rename from src/VisualStudio/Core/Def/EditorConfigSettings/Formatting/ViewModel/FormattingViewModel.cs rename to src/VisualStudio/Core/Def/EditorConfigSettings/Whitespace/ViewModel/WhitespaceViewModel.cs index 7885bb10cbb0a..9b3caeadc5ba1 100644 --- a/src/VisualStudio/Core/Def/EditorConfigSettings/Formatting/ViewModel/FormattingViewModel.cs +++ b/src/VisualStudio/Core/Def/EditorConfigSettings/Whitespace/ViewModel/WhitespaceViewModel.cs @@ -10,14 +10,14 @@ using Microsoft.VisualStudio.Shell.TableControl; using Microsoft.VisualStudio.Shell.TableManager; -namespace Microsoft.VisualStudio.LanguageServices.EditorConfigSettings.Formatting.ViewModel +namespace Microsoft.VisualStudio.LanguageServices.EditorConfigSettings.Whitespace.ViewModel { - internal partial class FormattingViewModel : SettingsViewModelBase< - FormattingSetting, - FormattingViewModel.SettingsSnapshotFactory, - FormattingViewModel.SettingsEntriesSnapshot> + internal partial class WhitespaceViewModel : SettingsViewModelBase< + WhitespaceSetting, + WhitespaceViewModel.SettingsSnapshotFactory, + WhitespaceViewModel.SettingsEntriesSnapshot> { - public FormattingViewModel(ISettingsProvider data, + public WhitespaceViewModel(ISettingsProvider data, IWpfTableControlProvider controlProvider, ITableManagerProvider tableMangerProvider) : base(data, controlProvider, tableMangerProvider) @@ -25,25 +25,25 @@ public FormattingViewModel(ISettingsProvider data, public override string Identifier => "Whitespace"; - protected override SettingsSnapshotFactory CreateSnapshotFactory(ISettingsProvider data) + protected override SettingsSnapshotFactory CreateSnapshotFactory(ISettingsProvider data) => new(data); protected override IEnumerable GetInitialColumnStates() => new[] { - new ColumnState2(ColumnDefinitions.Formatting.Category, isVisible: false, width: 0, groupingPriority: 1), - new ColumnState2(ColumnDefinitions.Formatting.Description, isVisible: true, width: 0), - new ColumnState2(ColumnDefinitions.Formatting.Value, isVisible: true, width: 0), - new ColumnState2(ColumnDefinitions.Formatting.Location, isVisible: true, width: 0) + new ColumnState2(ColumnDefinitions.Whitespace.Category, isVisible: false, width: 0, groupingPriority: 1), + new ColumnState2(ColumnDefinitions.Whitespace.Description, isVisible: true, width: 0), + new ColumnState2(ColumnDefinitions.Whitespace.Value, isVisible: true, width: 0), + new ColumnState2(ColumnDefinitions.Whitespace.Location, isVisible: true, width: 0) }; protected override string[] GetFixedColumns() => new[] { - ColumnDefinitions.Formatting.Category, - ColumnDefinitions.Formatting.Description, - ColumnDefinitions.Formatting.Value, - ColumnDefinitions.Formatting.Location + ColumnDefinitions.Whitespace.Category, + ColumnDefinitions.Whitespace.Description, + ColumnDefinitions.Whitespace.Value, + ColumnDefinitions.Whitespace.Location }; } } diff --git a/src/VisualStudio/Core/Def/ServicesVSResources.resx b/src/VisualStudio/Core/Def/ServicesVSResources.resx index 471edb8acd781..68a0baf7cfb6f 100644 --- a/src/VisualStudio/Core/Def/ServicesVSResources.resx +++ b/src/VisualStudio/Core/Def/ServicesVSResources.resx @@ -1678,8 +1678,8 @@ Additional information: {1} Error - - Formatting + + Whitespace Id diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf index d03a1a6d2586c..0753af220e702 100644 --- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf +++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf @@ -372,11 +372,6 @@ Formátovat dokument - - Formatting - Formátování - - Generate .editorconfig file from settings Generovat soubor .editorconfig z nastavení @@ -1287,6 +1282,11 @@ Tento pracovní prostor nepodporuje aktualizaci možností kompilace jazyka Visual Basic. + + Whitespace + Whitespace + + You must change the signature Je nutné změnit signaturu diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf index 19d30f78d4b1e..c5ab2f2cf642f 100644 --- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf +++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf @@ -372,11 +372,6 @@ Dokument formatieren - - Formatting - Formatierung - - Generate .editorconfig file from settings EDITORCONFIG-Datei aus Einstellungen generieren @@ -1287,6 +1282,11 @@ Das Aktualisieren von Visual Basic-Kompilierungsoptionen wird von diesem Arbeitsbereich nicht unterstützt. + + Whitespace + Whitespace + + You must change the signature Sie müssen die Signatur ändern. diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf index 4902dc676e210..54a42ef87611c 100644 --- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf +++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf @@ -372,11 +372,6 @@ Dar formato al documento - - Formatting - Formato - - Generate .editorconfig file from settings Generar archivo .editorconfig a partir de la configuración @@ -1287,6 +1282,11 @@ Esta área de trabajo no admite la actualización de opciones de compilación de Visual Basic. + + Whitespace + Whitespace + + You must change the signature Debe cambiar la firma diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf index 74a08ac6f9178..df29501c66e5d 100644 --- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf +++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf @@ -372,11 +372,6 @@ Mettre en forme le document - - Formatting - Mise en forme - - Generate .editorconfig file from settings Générer le fichier .editorconfig à partir des paramètres @@ -1287,6 +1282,11 @@ Cet espace de travail ne prend pas en charge la mise à jour des options de compilation Visual Basic. + + Whitespace + Whitespace + + You must change the signature Vous devez changer la signature diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf index 96bf25606b061..5f5e7d11b2a9c 100644 --- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf +++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf @@ -372,11 +372,6 @@ Formatta documento - - Formatting - Formattazione - - Generate .editorconfig file from settings Genera file con estensione editorconfig dalle impostazioni @@ -1287,6 +1282,11 @@ Quest'area di lavoro non supporta l'aggiornamento delle opzioni di compilazione di Visual Basic. + + Whitespace + Whitespace + + You must change the signature È necessario cambiare la firma diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf index d19a4bc18c362..ee914b6f1be69 100644 --- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf +++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf @@ -372,11 +372,6 @@ ドキュメントのフォーマット - - Formatting - 書式設定 - - Generate .editorconfig file from settings 設定から .editorconfig ファイルを生成 @@ -1287,6 +1282,11 @@ このワークスペースでは、Visual Basic コンパイル オプションの更新がサポートされていません。 + + Whitespace + Whitespace + + You must change the signature 署名を変更する必要があります diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf index f35f037118c7a..384b87b646521 100644 --- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf +++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf @@ -372,11 +372,6 @@ 문서 서식 - - Formatting - 서식 - - Generate .editorconfig file from settings 설정에서 .editorconfig 파일 생성 @@ -1287,6 +1282,11 @@ 이 작업 영역은 Visual Basic 컴파일 옵션 업데이트를 지원하지 않습니다. + + Whitespace + Whitespace + + You must change the signature 시그니처를 변경해야 합니다. diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf index 09928e2e0fa27..181a1f2b850f3 100644 --- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf +++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf @@ -372,11 +372,6 @@ Formatuj dokument - - Formatting - Formatowanie - - Generate .editorconfig file from settings Wygeneruj plik .editorconfig na podstawie ustawień @@ -1287,6 +1282,11 @@ Ten obszar roboczy nie obsługuje aktualizowania opcji kompilacji dla języka Visual Basic. + + Whitespace + Whitespace + + You must change the signature Musisz zmienić sygnaturę diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf index 298cfa41c27ba..5af4445989851 100644 --- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf +++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf @@ -372,11 +372,6 @@ Formatar o documento - - Formatting - Formatação - - Generate .editorconfig file from settings Gerar o arquivo .editorconfig das configurações @@ -1287,6 +1282,11 @@ Este workspace não é compatível com a atualização das opções de compilação do Visual Basic. + + Whitespace + Whitespace + + You must change the signature Você precisa alterar a assinatura diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf index 744fc11b80a3c..2c41a61642a7d 100644 --- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf +++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf @@ -372,11 +372,6 @@ Форматировать документ - - Formatting - Форматирование - - Generate .editorconfig file from settings Создать файл EDITORCONFIG на основе параметров @@ -1287,6 +1282,11 @@ Эта рабочая область не поддерживает обновление параметров компиляции Visual Basic. + + Whitespace + Whitespace + + You must change the signature Необходимо изменить подпись diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf index e46059095a78d..8df895d27f9cf 100644 --- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf +++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf @@ -372,11 +372,6 @@ Belgeyi biçimlendir - - Formatting - Biçimlendirme - - Generate .editorconfig file from settings Ayarlardan .editorconfig dosyası oluştur @@ -1287,6 +1282,11 @@ Bu çalışma alanı Visual Basic derleme seçeneklerinin güncelleştirilmesini desteklemiyor. + + Whitespace + Whitespace + + You must change the signature İmzayı değiştirmelisiniz diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf index 7f282b4901771..f6f47afa52544 100644 --- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf +++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf @@ -372,11 +372,6 @@ 设置文档的格式 - - Formatting - 格式设置 - - Generate .editorconfig file from settings 基于设置生成 .editorconfig 文件 @@ -1287,6 +1282,11 @@ 此工作区不支持更新 Visual Basic 编译选项。 + + Whitespace + Whitespace + + You must change the signature 必须更改签名 diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf index 7e3b77df63bee..a55cabb29af39 100644 --- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf +++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf @@ -372,11 +372,6 @@ 格式化文件 - - Formatting - 格式化 - - Generate .editorconfig file from settings 從設定產生 .editorconfig 檔案 @@ -1287,6 +1282,11 @@ 此工作區不支援更新 Visual Basic 編譯選項。 + + Whitespace + Whitespace + + You must change the signature 您必須變更簽章