From 451c0f7d9f3ccdc1106d945e806c09c76da1f3a1 Mon Sep 17 00:00:00 2001 From: Damian Suess Date: Fri, 21 Jul 2023 13:12:57 -0400 Subject: [PATCH] Updated EditorConfig to match ILSpy (PR #129) and suppress some Roslyn style errors --- .editorconfig | 121 +++++++++++++++++++++++++++++++++- ILSpy.Core/MainWindow.xaml.cs | 1 - 2 files changed, 119 insertions(+), 3 deletions(-) diff --git a/.editorconfig b/.editorconfig index b0f7703..f0f7ec6 100644 --- a/.editorconfig +++ b/.editorconfig @@ -5,22 +5,139 @@ root = true [*] end_of_line = crlf indent_style = tab +indent_size = 4 +guidelines = 110 -# Powershell [*.{ps1,psd1,psm1}] indent_style = space indent_size = 4 trim_trailing_whitespace = true +[*.il] +indent_style = space +indent_size = 2 +[*.{yml,yaml}] +indent_style = space +indent_size = 2 +[*.csproj] +indent_style = space +indent_size = 2 +[*.config] +indent_style = space +indent_size = 2 +[*.nuspec] +indent_style = space +indent_size = 2 +[*.vsixmanifest] +indent_style = space +indent_size = 2 +[*.vsct] +indent_style = space +indent_size = 2 [*.{cs,csx}] tab_width = 4 indent_size = 4 -end_of_line = crlf indent_style = tab +end_of_line = crlf charset = utf-8-bom trim_trailing_whitespace = true insert_final_newline = true +# New line preferences +csharp_new_line_before_open_brace = methods, types, control_blocks, local_functions +csharp_new_line_before_else = true +csharp_new_line_before_catch = true +csharp_new_line_before_finally = true +csharp_new_line_before_members_in_object_initializers = false +csharp_new_line_before_members_in_anonymous_types = false +csharp_new_line_within_query_expression_clauses = false + +# Indentation preferences +csharp_indent_block_contents = true +csharp_indent_braces = false +csharp_indent_case_contents = true +csharp_indent_case_contents_when_block = false +csharp_indent_switch_labels = true +csharp_indent_labels = one_less + +# Avoid 'this.' in generated code unless absolutely necessary, but allow developers to use it +dotnet_style_qualification_for_field = false:silent +dotnet_style_qualification_for_property = false:silent +dotnet_style_qualification_for_method = false:silent +dotnet_style_qualification_for_event = false:silent + +# Do not use 'var' when generating code, but allow developers to use it +csharp_style_var_for_built_in_types = false:silent +csharp_style_var_when_type_is_apparent = false:silent +csharp_style_var_elsewhere = false:silent + +# Use language keywords instead of BCL types when generating code, but allow developers to use either +dotnet_style_predefined_type_for_locals_parameters_members = true:silent +dotnet_style_predefined_type_for_member_access = true:silent + +# Using directives +dotnet_sort_system_directives_first = true +dotnet_separate_import_directive_groups = true + +# Wrapping +csharp_preserve_single_line_blocks = true +csharp_preserve_single_line_statements = false + +# Code style +csharp_prefer_braces = true:silent + +# Expression-level preferences +dotnet_style_object_initializer = true:suggestion +dotnet_style_collection_initializer = true:suggestion +dotnet_style_explicit_tuple_names = true:suggestion +dotnet_style_coalesce_expression = true:suggestion +dotnet_style_null_propagation = true:suggestion + +# Expression-bodied members +csharp_style_expression_bodied_methods = false:silent +csharp_style_expression_bodied_constructors = false:silent +csharp_style_expression_bodied_operators = false:silent +csharp_style_expression_bodied_properties = true:silent +csharp_style_expression_bodied_indexers = true:silent +csharp_style_expression_bodied_accessors = true:silent + +# Pattern matching +csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion +csharp_style_pattern_matching_over_as_with_null_check = true:suggestion +csharp_style_inlined_variable_declaration = true:suggestion + +# Null checking preferences +csharp_style_throw_expression = true:suggestion +csharp_style_conditional_delegate_call = true:suggestion + +# Space preferences +csharp_space_after_cast = false +csharp_space_after_colon_in_inheritance_clause = true +csharp_space_after_comma = true +csharp_space_after_dot = false +csharp_space_after_keywords_in_control_flow_statements = true +csharp_space_after_semicolon_in_for_statement = true +csharp_space_around_binary_operators = before_and_after +csharp_space_around_declaration_statements = do_not_ignore +csharp_space_before_colon_in_inheritance_clause = true +csharp_space_before_comma = false +csharp_space_before_dot = false +csharp_space_before_open_square_brackets = false +csharp_space_before_semicolon_in_for_statement = false +csharp_space_between_empty_square_brackets = false +csharp_space_between_method_call_empty_parameter_list_parentheses = false +csharp_space_between_method_call_name_and_opening_parenthesis = false +csharp_space_between_method_call_parameter_list_parentheses = false +csharp_space_between_method_declaration_empty_parameter_list_parentheses = false +csharp_space_between_method_declaration_name_and_open_parenthesis = false +csharp_space_between_method_declaration_parameter_list_parentheses = false +csharp_space_between_parentheses = false +csharp_space_between_square_brackets = false + ## Suppressions for ILSpy coding style + +# IDE2002:Consecutive braces must not have blank line between them +dotnet_diagnostic.IDE2002.severity = warning + # dotnet_diagnostic.IDE2003.severity = error dotnet_style_allow_statement_immediately_after_block_experimental = false:warning diff --git a/ILSpy.Core/MainWindow.xaml.cs b/ILSpy.Core/MainWindow.xaml.cs index 645de6c..60693b4 100644 --- a/ILSpy.Core/MainWindow.xaml.cs +++ b/ILSpy.Core/MainWindow.xaml.cs @@ -1202,7 +1202,6 @@ void RefreshCommandExecuted(object sender, ExecutedRoutedEventArgs e) } finally { refreshInProgress = false; } - } void SearchCommandExecuted(object sender, ExecutedRoutedEventArgs e)