From 27b252f4057760f84779c8766e0f68ca2950a14e Mon Sep 17 00:00:00 2001 From: Robert Dailey Date: Thu, 6 Oct 2022 18:26:54 -0500 Subject: [PATCH] chore: Update DotSettings and editorconfig files --- src/.editorconfig | 40 ++++++++++++++++++++++++++++++++++- src/Recyclarr.sln.DotSettings | 8 +++---- 2 files changed, 43 insertions(+), 5 deletions(-) diff --git a/src/.editorconfig b/src/.editorconfig index eda9f76f..ed35dd72 100644 --- a/src/.editorconfig +++ b/src/.editorconfig @@ -15,7 +15,7 @@ csharp_new_line_before_finally = true csharp_new_line_before_members_in_object_initializers = false csharp_new_line_before_open_brace = all csharp_new_line_between_query_expression_clauses = true -csharp_preferred_modifier_order = public, private, protected, internal, new, abstract, virtual, sealed, override, static, readonly, extern, unsafe, volatile, async:suggestion +csharp_preferred_modifier_order = public, private, protected, internal, new, abstract, virtual, sealed, override, static, readonly, extern, unsafe, volatile, async, required:suggestion csharp_prefer_braces = true:none csharp_preserve_single_line_blocks = true csharp_space_after_cast = true @@ -666,6 +666,12 @@ dotnet_naming_rule.local_constants_rule.import_to_resharper = as_predefined dotnet_naming_rule.local_constants_rule.severity = warning dotnet_naming_rule.local_constants_rule.style = lower_camel_case_style_1 dotnet_naming_rule.local_constants_rule.symbols = local_constants_symbols +dotnet_naming_rule.local_constants_rule_1.import_to_resharper = True +dotnet_naming_rule.local_constants_rule_1.resharper_description = LocalConstants +dotnet_naming_rule.local_constants_rule_1.resharper_guid = aa1dfe9d-76b4-433d-a39c-a534ef5c96d6 +dotnet_naming_rule.local_constants_rule_1.severity = warning +dotnet_naming_rule.local_constants_rule_1.style = lower_camel_case_style_1 +dotnet_naming_rule.local_constants_rule_1.symbols = local_constants_symbols_1 dotnet_naming_rule.local_functions_rule.import_to_resharper = as_predefined dotnet_naming_rule.local_functions_rule.severity = warning dotnet_naming_rule.local_functions_rule.style = upper_camel_case_style @@ -686,10 +692,20 @@ dotnet_naming_rule.private_instance_fields_rule.import_to_resharper = as_predefi dotnet_naming_rule.private_instance_fields_rule.severity = warning dotnet_naming_rule.private_instance_fields_rule.style = lower_camel_case_style dotnet_naming_rule.private_instance_fields_rule.symbols = private_instance_fields_symbols +dotnet_naming_rule.private_static_fields_override_rule.import_to_resharper = False +dotnet_naming_rule.private_static_fields_override_rule.severity = warning +dotnet_naming_rule.private_static_fields_override_rule.style = upper_camel_case_style +dotnet_naming_rule.private_static_fields_override_rule.symbols = private_static_fields_override_symbols dotnet_naming_rule.private_static_fields_rule.import_to_resharper = as_predefined dotnet_naming_rule.private_static_fields_rule.severity = warning dotnet_naming_rule.private_static_fields_rule.style = lower_camel_case_style dotnet_naming_rule.private_static_fields_rule.symbols = private_static_fields_symbols +dotnet_naming_rule.private_static_fields_rule_1.import_to_resharper = True +dotnet_naming_rule.private_static_fields_rule_1.resharper_description = PrivateStaticFields +dotnet_naming_rule.private_static_fields_rule_1.resharper_guid = bdf0be50-a9ee-4fe9-8ba0-6de83eb008ba +dotnet_naming_rule.private_static_fields_rule_1.severity = warning +dotnet_naming_rule.private_static_fields_rule_1.style = lower_camel_case_style +dotnet_naming_rule.private_static_fields_rule_1.symbols = private_static_fields_symbols_1 dotnet_naming_rule.private_static_readonly_rule.import_to_resharper = as_predefined dotnet_naming_rule.private_static_readonly_rule.severity = warning dotnet_naming_rule.private_static_readonly_rule.style = upper_camel_case_style @@ -734,6 +750,11 @@ dotnet_naming_symbols.locals_symbols.applicable_kinds = local dotnet_naming_symbols.local_constants_symbols.applicable_accessibilities = * dotnet_naming_symbols.local_constants_symbols.applicable_kinds = local dotnet_naming_symbols.local_constants_symbols.required_modifiers = const +dotnet_naming_symbols.local_constants_symbols_1.applicable_accessibilities = * +dotnet_naming_symbols.local_constants_symbols_1.applicable_kinds = local +dotnet_naming_symbols.local_constants_symbols_1.required_modifiers = const +dotnet_naming_symbols.local_constants_symbols_1.resharper_applicable_kinds = local_constant +dotnet_naming_symbols.local_constants_symbols_1.resharper_required_modifiers = any dotnet_naming_symbols.local_functions_symbols.applicable_accessibilities = * dotnet_naming_symbols.local_functions_symbols.applicable_kinds = local_function dotnet_naming_symbols.method_symbols.applicable_accessibilities = * @@ -745,9 +766,17 @@ dotnet_naming_symbols.private_constants_symbols.applicable_kinds = field dotnet_naming_symbols.private_constants_symbols.required_modifiers = const dotnet_naming_symbols.private_instance_fields_symbols.applicable_accessibilities = private dotnet_naming_symbols.private_instance_fields_symbols.applicable_kinds = field +dotnet_naming_symbols.private_static_fields_override_symbols.applicable_accessibilities = local,private +dotnet_naming_symbols.private_static_fields_override_symbols.applicable_kinds = field +dotnet_naming_symbols.private_static_fields_override_symbols.required_modifiers = const,static dotnet_naming_symbols.private_static_fields_symbols.applicable_accessibilities = private dotnet_naming_symbols.private_static_fields_symbols.applicable_kinds = field dotnet_naming_symbols.private_static_fields_symbols.required_modifiers = static +dotnet_naming_symbols.private_static_fields_symbols_1.applicable_accessibilities = local,private +dotnet_naming_symbols.private_static_fields_symbols_1.applicable_kinds = field +dotnet_naming_symbols.private_static_fields_symbols_1.required_modifiers = static +dotnet_naming_symbols.private_static_fields_symbols_1.resharper_applicable_kinds = field +dotnet_naming_symbols.private_static_fields_symbols_1.resharper_required_modifiers = static dotnet_naming_symbols.private_static_readonly_symbols.applicable_accessibilities = private dotnet_naming_symbols.private_static_readonly_symbols.applicable_kinds = field dotnet_naming_symbols.private_static_readonly_symbols.required_modifiers = static, readonly @@ -2227,3 +2256,12 @@ indent_size = 2 indent_style = space indent_size = 4 tab_width = 4 + +[{*.ant,*.appxmanifest,*.axml,*.cscfg,*.csdef,*.disco,*.filelayout,*.fxml,*.jhm,*.jnlp,*.jrxml,*.manifest,*.myapp,*.nuspec,*.rng,*.stylecop,*.svcmap,*.tld,*.tps,*.wadcfgx,*.webref,*.wsdl,*.xml,*.xsd,*.xsl,*.xslt,*.xul,StyleCop.Cache}] +indent_style = space +indent_size = 2 + +[*.{appxmanifest,asax,ascx,aspx,axaml,build,c,c++,cc,cginc,compute,cp,cpp,cs,cshtml,cu,cuh,cxx,dtd,fx,fxh,h,hh,hlsl,hlsli,hlslinc,hpp,hxx,inc,inl,ino,ipp,master,mpp,mq4,mq5,mqh,nuspec,paml,razor,resw,resx,skin,tpp,usf,ush,vb,xaml,xamlx,xoml,xsd}] +indent_style = space +indent_size = 4 +tab_width = 4 diff --git a/src/Recyclarr.sln.DotSettings b/src/Recyclarr.sln.DotSettings index 8b453bb6..95d15869 100644 --- a/src/Recyclarr.sln.DotSettings +++ b/src/Recyclarr.sln.DotSettings @@ -14,16 +14,16 @@ &lt;inspection_tool class="UnnecessaryReturnJS" enabled="false" level="WARNING" enabled_by_default="false" /&gt; &lt;/profile&gt;</IDEA_SETTINGS><CSShortenReferences>True</CSShortenReferences><CSUpdateFileHeader>True</CSUpdateFileHeader><RIDER_SETTINGS>&lt;profile&gt; &lt;Language id="CSS"&gt; - &lt;Rearrange&gt;false&lt;/Rearrange&gt; &lt;Reformat&gt;false&lt;/Reformat&gt; + &lt;Rearrange&gt;false&lt;/Rearrange&gt; &lt;/Language&gt; &lt;Language id="EditorConfig"&gt; &lt;Reformat&gt;false&lt;/Reformat&gt; &lt;/Language&gt; &lt;Language id="HTML"&gt; + &lt;Reformat&gt;false&lt;/Reformat&gt; &lt;OptimizeImports&gt;false&lt;/OptimizeImports&gt; &lt;Rearrange&gt;false&lt;/Rearrange&gt; - &lt;Reformat&gt;false&lt;/Reformat&gt; &lt;/Language&gt; &lt;Language id="Ini"&gt; &lt;Reformat&gt;false&lt;/Reformat&gt; @@ -32,9 +32,9 @@ &lt;Reformat&gt;false&lt;/Reformat&gt; &lt;/Language&gt; &lt;Language id="JavaScript"&gt; + &lt;Reformat&gt;false&lt;/Reformat&gt; &lt;OptimizeImports&gt;false&lt;/OptimizeImports&gt; &lt;Rearrange&gt;false&lt;/Rearrange&gt; - &lt;Reformat&gt;false&lt;/Reformat&gt; &lt;/Language&gt; &lt;Language id="Markdown"&gt; &lt;Reformat&gt;false&lt;/Reformat&gt; @@ -46,9 +46,9 @@ &lt;Reformat&gt;false&lt;/Reformat&gt; &lt;/Language&gt; &lt;Language id="XML"&gt; + &lt;Reformat&gt;false&lt;/Reformat&gt; &lt;OptimizeImports&gt;false&lt;/OptimizeImports&gt; &lt;Rearrange&gt;false&lt;/Rearrange&gt; - &lt;Reformat&gt;false&lt;/Reformat&gt; &lt;/Language&gt; &lt;Language id="yaml"&gt; &lt;Reformat&gt;false&lt;/Reformat&gt;