From 5f118dd42ce71e2ea457c939a03fa88dda7654fb Mon Sep 17 00:00:00 2001 From: Gabriela Trutan Date: Thu, 17 Oct 2024 12:51:44 +0200 Subject: [PATCH 1/5] Enhance .editorconfig with more rules --- .editorconfig | 313 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 302 insertions(+), 11 deletions(-) diff --git a/.editorconfig b/.editorconfig index 438307edec..846ef81a1c 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,4 +1,3 @@ -# top-most EditorConfig file root = true # ---------------------------------------------------------------------------------------------------------------------- @@ -15,6 +14,8 @@ indent_style = space indent_size = 4 insert_final_newline = true charset = utf-8-bom +trim_trailing_whitespace = true +max_line_length = 200 # Xml project files [*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj}] @@ -49,21 +50,311 @@ indent_size = 2 # Sort using and Import directives with System.* appearing first dotnet_sort_system_directives_first = true # Avoid "this." and "Me." if not necessary -#dotnet_style_qualification_for_field = false:suggestion -#dotnet_style_qualification_for_property = false:suggestion -#dotnet_style_qualification_for_method = false:suggestion -#dotnet_style_qualification_for_event = false:suggestion +dotnet_style_qualification_for_field = false:suggestion +dotnet_style_qualification_for_property = false:suggestion +dotnet_style_qualification_for_method = false:suggestion +dotnet_style_qualification_for_event = false:suggestion csharp_style_inlined_variable_declaration = false:suggestion [*.cs] -# IDE0039: Use local function +# Use language keywords instead of framework type names for type references +dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion +dotnet_style_predefined_type_for_member_access = true:suggestion + +dotnet_style_require_accessibility_modifiers = for_non_interface_members:warning + +# Suggest more modern language features when available +dotnet_style_coalesce_expression = true:suggestion +dotnet_style_collection_initializer = true:suggestion +dotnet_style_explicit_tuple_names = true:suggestion +dotnet_style_null_propagation = true:suggestion +dotnet_style_object_initializer = true:suggestion +dotnet_style_prefer_auto_properties = true:suggestion +dotnet_style_prefer_compound_assignment = true:suggestion +dotnet_style_prefer_conditional_expression_over_assignment = true:suggestion +dotnet_style_prefer_conditional_expression_over_return = true:suggestion +dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion +dotnet_style_prefer_inferred_tuple_names = true:suggestion +dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion +dotnet_style_prefer_simplified_interpolation = true:suggestion + +# Parentheses +dotnet_style_parentheses_in_arithmetic_binary_operators = never_if_unnecessary:silent +dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent +dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:suggestion +dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent + +# CSharp code style settings: +[*.cs] +csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:warning +csharp_prefer_braces = true:warning + +# Prefer "var" everywhere +csharp_style_var_for_built_in_types = true:suggestion +csharp_style_var_when_type_is_apparent = true:suggestion +csharp_style_var_elsewhere = true:suggestion + +# Prefer expression-body +csharp_style_expression_bodied_methods = true:suggestion +csharp_style_expression_bodied_constructors = true:silent +csharp_style_expression_bodied_operators = true:suggestion +csharp_style_expression_bodied_properties = true:suggestion +csharp_style_expression_bodied_indexers = true:suggestion +csharp_style_expression_bodied_accessors = true:suggestion +csharp_style_expression_bodied_lambdas = true:suggestion +csharp_style_expression_bodied_local_functions = true:suggestion + +# Suggest more modern language features when available +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 +csharp_prefer_simple_default_expression = true:suggestion +csharp_style_deconstructed_variable_declaration = true:suggestion csharp_style_pattern_local_over_anonymous_function = false:suggestion +csharp_style_throw_expression = true:suggestion +csharp_style_conditional_delegate_call = true:suggestion + +# Newline settings +csharp_new_line_before_open_brace = all +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 = true +csharp_new_line_before_members_in_anonymous_types = true +csharp_new_line_between_query_expression_clauses = true + +# Indent +csharp_indent_case_contents = true +csharp_indent_switch_labels = true +csharp_indent_labels = one_less_than_current +# undocumented +csharp_indent_block_contents = true +csharp_indent_braces = false +csharp_indent_case_contents_when_block = true + +# Spaces +csharp_space_after_cast = false +csharp_space_after_keywords_in_control_flow_statements = true +csharp_space_between_method_declaration_parameter_list_parentheses = false +csharp_space_between_method_call_parameter_list_parentheses = false +csharp_space_between_parentheses = false +# undocumented +csharp_space_between_method_call_name_and_opening_parenthesis = false +csharp_space_between_method_declaration_name_and_open_parenthesis = false +csharp_space_after_colon_in_inheritance_clause = true +csharp_space_before_colon_in_inheritance_clause = true +csharp_space_after_comma = true +csharp_space_before_comma = false +csharp_space_after_dot = false +csharp_space_before_dot = false +csharp_space_after_semicolon_in_for_statement = true +csharp_space_before_semicolon_in_for_statement = false +# Extra space before equals sign DOES MATTER https://github.com/dotnet/roslyn/issues/20355 +csharp_space_around_binary_operators = before_and_after +csharp_space_around_declaration_statements = do_not_ignore +csharp_space_before_open_square_brackets = false +csharp_space_between_empty_square_brackets = false +csharp_space_between_method_call_empty_parameter_list_parentheses = false +csharp_space_between_method_declaration_empty_parameter_list_parentheses = false +csharp_space_between_square_brackets = false + +# Wrapping +csharp_preserve_single_line_statements = false +csharp_preserve_single_line_blocks = true + +# ---------------------------------------------------------------------------------------------------------------------- +# Naming conventions +# ---------------------------------------------------------------------------------------------------------------------- + +# ORDERING DOES MATTER!!! +# Naming conventions should be ordered from most-specific to least-specific in the .editorconfig file. +# The first rule encountered that can be applied is the only rule that is applied. + +[*.{cs,vb}] + +# Naming rules + +dotnet_naming_rule.interface_must_start_with_I.severity = warning +dotnet_naming_rule.interface_must_start_with_I.symbols = interface_types +dotnet_naming_rule.interface_must_start_with_I.style = I_style + +dotnet_naming_rule.variables_must_be_camel_style.severity = warning +dotnet_naming_rule.variables_must_be_camel_style.symbols = parameter_types +dotnet_naming_rule.variables_must_be_camel_style.style = camel_style + +dotnet_naming_rule.types_should_be_pascal_case.severity = warning +dotnet_naming_rule.types_should_be_pascal_case.symbols = types +dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case + +dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = warning +dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members +dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case + +# Symbol specifications + +dotnet_naming_symbols.interface_types.applicable_kinds = interface +dotnet_naming_symbols.interface_types.applicable_accessibilities = * + +dotnet_naming_symbols.parameter_types.applicable_kinds = parameter + +dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum +dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected + +dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method +dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected + +# Naming styles + +dotnet_naming_style.pascal_case.capitalization = pascal_case + +dotnet_naming_style.camel_style.capitalization = camel_case + +dotnet_naming_style.I_style.required_prefix = I +dotnet_naming_style.I_style.capitalization = pascal_case + +# ---------------------------------------------------------------------------------------------------------------------- +# Rules +# ---------------------------------------------------------------------------------------------------------------------- + +dotnet_diagnostic.S1451.severity = warning # Force activation of license header check for UTs +dotnet_diagnostic.CS7035.severity = none # CS7035: it expects the build number to fit in 16 bits, our build numbers are bigger https://github.com/dotnet/roslyn/issues/17024#issuecomment-1669503201 +dotnet_diagnostic.CA1822.severity = warning # Increase visibility for Member 'xxx' does not access instance data and can be marked as static +dotnet_diagnostic.CS8785.severity = error # Do not hide root cause for: Generator 'xxx' failed to generate source. It will not contribute to the output and compilation errors may occur as a result. Exception was of type 'xxx' with message 'xxx' +dotnet_diagnostic.RS2008.severity = none # Enable analyzer release tracking - we don't use the release tracking analyzer +dotnet_diagnostic.RS1036.severity = none # A project containing analyzers or source generators should specify the property 'true' - we're intentially violating a lot of those types +dotnet_diagnostic.IDE0057.severity = none # Use range operator +dotnet_diagnostic.IDE0290.severity = none # Use primary constructors + +# +# ReSharper rules +# + +# ReSharper properties +resharper_align_multiline_argument = true +resharper_align_multiline_expression = true +resharper_align_multiline_parameter = true +resharper_align_multiple_declaration = true +resharper_blank_lines_after_block_statements = 0 +resharper_blank_lines_around_auto_property = 0 +resharper_blank_lines_around_single_line_local_method = 1 +resharper_blank_lines_around_single_line_type = 0 +resharper_csharp_align_multiline_argument = false +resharper_csharp_align_multiline_expression = false +resharper_csharp_align_multiline_parameter = false +resharper_csharp_align_multiple_declaration = false +resharper_csharp_blank_lines_around_field = 0 +resharper_csharp_blank_lines_around_single_line_invocable = 1 +resharper_csharp_keep_blank_lines_in_code = 1 +resharper_csharp_keep_blank_lines_in_declarations = 1 +resharper_csharp_wrap_parameters_style = chop_if_long +resharper_indent_primary_constructor_decl_pars = inside +resharper_keep_existing_expr_member_arrangement = false +resharper_keep_existing_primary_constructor_declaration_parens_arrangement = false +resharper_max_formal_parameters_on_line = 3 +resharper_max_primary_constructor_parameters_on_line = 3 +resharper_place_accessorholder_attribute_on_same_line = false +resharper_place_accessor_attribute_on_same_line = false +resharper_place_field_attribute_on_same_line = false +resharper_wrap_after_declaration_lpar = true +resharper_wrap_before_eq = true +resharper_wrap_before_first_type_parameter_constraint = true -# IDE0016: Use 'throw' expression -csharp_style_throw_expression = false:suggestion +# Microsoft .NET properties +csharp_new_line_before_members_in_object_initializers = false +csharp_preferred_modifier_order = public, private, protected, internal, file, new, static, abstract, virtual, sealed, readonly, override, extern, unsafe, volatile, async, required:suggestion +csharp_style_prefer_utf8_string_literals = true:suggestion +csharp_style_var_elsewhere = true:suggestion +csharp_style_var_for_built_in_types = true:suggestion +csharp_style_var_when_type_is_apparent = true:suggestion +dotnet_naming_rule.method_rule.import_to_resharper = True +dotnet_naming_rule.method_rule.resharper_description = Methods +dotnet_naming_rule.method_rule.resharper_guid = 8284009d-e743-4d89-9402-a5bf9a89b657 +dotnet_naming_rule.method_rule.resharper_style = AaBb, AaBb_AaBb +dotnet_naming_rule.method_rule.severity = warning +dotnet_naming_rule.method_rule.style = upper_camel_case_style +dotnet_naming_rule.method_rule.symbols = method_symbols +dotnet_naming_rule.private_constants_rule.import_to_resharper = True +dotnet_naming_rule.private_constants_rule.resharper_description = Constant fields (private) +dotnet_naming_rule.private_constants_rule.resharper_guid = 236f7aa5-7b06-43ca-bf2a-9b31bfcff09a +dotnet_naming_rule.private_constants_rule.severity = warning +dotnet_naming_rule.private_constants_rule.style = upper_camel_case_style +dotnet_naming_rule.private_constants_rule.symbols = private_constants_symbols +dotnet_naming_rule.private_instance_fields_rule.import_to_resharper = True +dotnet_naming_rule.private_instance_fields_rule.resharper_description = Instance fields (private) +dotnet_naming_rule.private_instance_fields_rule.resharper_guid = 4a98fdf6-7d98-4f5a-afeb-ea44ad98c70c +dotnet_naming_rule.private_instance_fields_rule.severity = warning +dotnet_naming_rule.private_instance_fields_rule.style = lower_camel_case_style_1 +dotnet_naming_rule.private_instance_fields_rule.symbols = private_instance_fields_symbols +dotnet_naming_rule.private_static_fields_rule.import_to_resharper = True +dotnet_naming_rule.private_static_fields_rule.resharper_description = Static fields (private) +dotnet_naming_rule.private_static_fields_rule.resharper_guid = f9fce829-e6f4-4cb2-80f1-5497c44f51df +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_readonly_rule.import_to_resharper = True +dotnet_naming_rule.private_static_readonly_rule.resharper_description = Static readonly fields (private) +dotnet_naming_rule.private_static_readonly_rule.resharper_guid = 15b5b1f1-457c-4ca6-b278-5615aedc07d3 +dotnet_naming_rule.private_static_readonly_rule.severity = warning +dotnet_naming_rule.private_static_readonly_rule.style = upper_camel_case_style +dotnet_naming_rule.private_static_readonly_rule.symbols = private_static_readonly_symbols +dotnet_naming_rule.type_parameters_rule.import_to_resharper = True +dotnet_naming_rule.type_parameters_rule.resharper_description = Type parameters +dotnet_naming_rule.type_parameters_rule.resharper_guid = 2c62818f-621b-4425-adc9-78611099bfcb +dotnet_naming_rule.type_parameters_rule.severity = warning +dotnet_naming_rule.type_parameters_rule.style = upper_camel_case_style +dotnet_naming_rule.type_parameters_rule.symbols = type_parameters_symbols +dotnet_naming_style.lower_camel_case_style.capitalization = camel_case +dotnet_naming_style.lower_camel_case_style.required_prefix = _ +dotnet_naming_style.lower_camel_case_style_1.capitalization = camel_case +dotnet_naming_style.upper_camel_case_style.capitalization = pascal_case +dotnet_naming_symbols.method_symbols.applicable_accessibilities = * +dotnet_naming_symbols.method_symbols.applicable_kinds = method +dotnet_naming_symbols.method_symbols.resharper_applicable_kinds = method +dotnet_naming_symbols.method_symbols.resharper_required_modifiers = any +dotnet_naming_symbols.private_constants_symbols.applicable_accessibilities = private +dotnet_naming_symbols.private_constants_symbols.applicable_kinds = field +dotnet_naming_symbols.private_constants_symbols.required_modifiers = const +dotnet_naming_symbols.private_constants_symbols.resharper_applicable_kinds = constant_field +dotnet_naming_symbols.private_constants_symbols.resharper_required_modifiers = any +dotnet_naming_symbols.private_instance_fields_symbols.applicable_accessibilities = private +dotnet_naming_symbols.private_instance_fields_symbols.applicable_kinds = field +dotnet_naming_symbols.private_instance_fields_symbols.resharper_applicable_kinds = field,readonly_field +dotnet_naming_symbols.private_instance_fields_symbols.resharper_required_modifiers = instance +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.resharper_applicable_kinds = field +dotnet_naming_symbols.private_static_fields_symbols.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 = readonly,static +dotnet_naming_symbols.private_static_readonly_symbols.resharper_applicable_kinds = readonly_field +dotnet_naming_symbols.private_static_readonly_symbols.resharper_required_modifiers = static +dotnet_naming_symbols.type_parameters_symbols.applicable_accessibilities = * +dotnet_naming_symbols.type_parameters_symbols.applicable_kinds = type_parameter +dotnet_naming_symbols.type_parameters_symbols.resharper_applicable_kinds = type_parameter +dotnet_naming_symbols.type_parameters_symbols.resharper_required_modifiers = any +dotnet_style_parentheses_in_arithmetic_binary_operators = never_if_unnecessary:none +dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:none +dotnet_style_parentheses_in_relational_binary_operators = never_if_unnecessary:none +dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion +dotnet_style_predefined_type_for_member_access = true:suggestion +dotnet_style_qualification_for_event = false:suggestion +dotnet_style_qualification_for_field = false:suggestion +dotnet_style_qualification_for_method = false:suggestion +dotnet_style_qualification_for_property = false:suggestion +dotnet_style_require_accessibility_modifiers = for_non_interface_members:suggestion -# CS7035: it expects the build number to fit in 16 bits, our build numbers are bigger https://github.com/dotnet/roslyn/issues/17024#issuecomment-1669503201 -dotnet_diagnostic.CS7035.severity = none -dotnet_diagnostic.S1451.severity = warning # Force activation of license header check for UTs \ No newline at end of file +# ReSharper inspection severities +resharper_arrange_redundant_parentheses_highlighting = hint +resharper_arrange_this_qualifier_highlighting = hint +resharper_arrange_type_member_modifiers_highlighting = hint +resharper_arrange_type_modifiers_highlighting = hint +resharper_built_in_type_reference_style_for_member_access_highlighting = hint +resharper_built_in_type_reference_style_highlighting = hint +resharper_redundant_base_qualifier_highlighting = warning +resharper_suggest_var_or_type_built_in_types_highlighting = hint +resharper_suggest_var_or_type_elsewhere_highlighting = hint +resharper_suggest_var_or_type_simple_types_highlighting = hint \ No newline at end of file From 60799851ef44a18a1daa2a0f5c2dc69c3ae4faec Mon Sep 17 00:00:00 2001 From: Gabriela Trutan Date: Wed, 23 Oct 2024 18:20:23 +0200 Subject: [PATCH 2/5] Add shared settings for Resharper --- ...t.VisualStudio.Integration.sln.DotSettings | 240 ++++++++++++++++++ 1 file changed, 240 insertions(+) create mode 100644 SonarLint.VisualStudio.Integration.sln.DotSettings diff --git a/SonarLint.VisualStudio.Integration.sln.DotSettings b/SonarLint.VisualStudio.Integration.sln.DotSettings new file mode 100644 index 0000000000..a612275d9f --- /dev/null +++ b/SonarLint.VisualStudio.Integration.sln.DotSettings @@ -0,0 +1,240 @@ + + True + True + + <?xml version="1.0" encoding="utf-16"?><Profile name="Copy of Built-in: Reformat Code"><XAMLCollapseEmptyTags>False</XAMLCollapseEmptyTags><XMLReformatCode>True</XMLReformatCode><HtmlReformatCode>True</HtmlReformatCode><VBReformatCode>True</VBReformatCode><CSReformatCode>True</CSReformatCode><CSOptimizeUsings><OptimizeUsings>True</OptimizeUsings></CSOptimizeUsings><CSMakeFieldReadonly>True</CSMakeFieldReadonly><CSCodeStyleAttributes /><CSArrangeQualifiers>True</CSArrangeQualifiers></Profile> + + Built-in: Full Cleanup + Copy of Built-in: Reformat Code + 0 + 0 + 0 + 1 + 1 + 0 + 1 + 1 + False + False + 3 + 3 + NEVER + NEVER + NEVER + True + True + True + CHOP_IF_LONG + <Patterns xmlns="urn:schemas-jetbrains-com:member-reordering-patterns"> + <TypePattern DisplayName="Non-reorderable types" Priority="99999999"> + <TypePattern.Match> + <Or> + <And> + <Kind Is="Interface" /> + <Or> + <HasAttribute Name="System.Runtime.InteropServices.InterfaceTypeAttribute" /> + <HasAttribute Name="System.Runtime.InteropServices.ComImport" /> + </Or> + </And> + <Kind Is="Struct" /> + <HasAttribute Name="System.Runtime.InteropServices.StructLayoutAttribute" /> + <HasAttribute Name="JetBrains.Annotations.NoReorderAttribute" /> + </Or> + </TypePattern.Match> + </TypePattern> + <TypePattern DisplayName="xUnit.net Test Classes" RemoveRegions="All"> + <TypePattern.Match> + <And> + <Kind Is="Class" /> + <HasMember> + <And> + <Kind Is="Method" /> + <HasAttribute Inherited="True" Name="Xunit.FactAttribute" /> + <HasAttribute Inherited="True" Name="Xunit.TheoryAttribute" /> + </And> + </HasMember> + </And> + </TypePattern.Match> + <Entry DisplayName="Fields"> + <Entry.Match> + <And> + <Kind Is="Field" /> + <Not> + <Static /> + </Not> + </And> + </Entry.Match> + <Entry.SortBy> + <Readonly /> + <Name /> + </Entry.SortBy> + </Entry> + <Entry DisplayName="Constructors"> + <Entry.Match> + <Kind Is="Constructor" /> + </Entry.Match> + <Entry.SortBy> + <Static /> + </Entry.SortBy> + </Entry> + <Entry DisplayName="Teardown Methods"> + <Entry.Match> + <And> + <Kind Is="Method" /> + <ImplementsInterface Name="System.IDisposable" /> + </And> + </Entry.Match> + </Entry> + <Entry DisplayName="All other members" /> + <Entry DisplayName="Test Methods" Priority="100"> + <Entry.Match> + <And> + <Kind Is="Method" /> + <HasAttribute Name="Xunit.FactAttribute" /> + <HasAttribute Name="Xunit.TheoryAttribute" /> + </And> + </Entry.Match> + <Entry.SortBy> + <Name /> + </Entry.SortBy> + </Entry> + </TypePattern> + <TypePattern DisplayName="NUnit Test Fixtures" RemoveRegions="All"> + <TypePattern.Match> + <And> + <Kind Is="Class" /> + <Or> + <HasAttribute Inherited="True" Name="NUnit.Framework.TestFixtureAttribute" /> + <HasAttribute Inherited="True" Name="NUnit.Framework.TestFixtureSourceAttribute" /> + <HasMember> + <And> + <Kind Is="Method" /> + <HasAttribute Name="NUnit.Framework.TestAttribute" /> + <HasAttribute Name="NUnit.Framework.TestCaseAttribute" /> + <HasAttribute Name="NUnit.Framework.TestCaseSourceAttribute" /> + </And> + </HasMember> + </Or> + </And> + </TypePattern.Match> + <Entry DisplayName="Setup/Teardown Methods"> + <Entry.Match> + <And> + <Kind Is="Method" /> + <Or> + <HasAttribute Inherited="True" Name="NUnit.Framework.SetUpAttribute" /> + <HasAttribute Inherited="True" Name="NUnit.Framework.TearDownAttribute" /> + <HasAttribute Inherited="True" Name="NUnit.Framework.TestFixtureSetUpAttribute" /> + <HasAttribute Inherited="True" Name="NUnit.Framework.TestFixtureTearDownAttribute" /> + <HasAttribute Inherited="True" Name="NUnit.Framework.OneTimeSetUpAttribute" /> + <HasAttribute Inherited="True" Name="NUnit.Framework.OneTimeTearDownAttribute" /> + </Or> + </And> + </Entry.Match> + </Entry> + <Entry DisplayName="All other members" /> + <Entry DisplayName="Test Methods" Priority="100"> + <Entry.Match> + <And> + <Kind Is="Method" /> + <HasAttribute Name="NUnit.Framework.TestAttribute" /> + <HasAttribute Name="NUnit.Framework.TestCaseAttribute" /> + <HasAttribute Name="NUnit.Framework.TestCaseSourceAttribute" /> + </And> + </Entry.Match> + <Entry.SortBy> + <Name /> + </Entry.SortBy> + </Entry> + </TypePattern> + <TypePattern DisplayName="Default Pattern"> + <Entry DisplayName="Static Fields and Constants"> + <Entry.Match> + <Or> + <Kind Is="Constant" /> + <And> + <Kind Is="Field" /> + <Static /> + </And> + </Or> + </Entry.Match> + <Entry.SortBy> + <Kind Is="0" Order="Constant Field" /> + </Entry.SortBy> + </Entry> + <Entry DisplayName="Fields"> + <Entry.Match> + <And> + <Kind Is="Field" /> + <Not> + <Static /> + </Not> + </And> + </Entry.Match> + <Entry.SortBy> + <Readonly /> + <Name /> + </Entry.SortBy> + </Entry> + <Entry DisplayName="Public Enums" Priority="100"> + <Entry.Match> + <And> + <Access Is="Public" /> + <Kind Is="Enum" /> + </And> + </Entry.Match> + <Entry.SortBy> + <Name /> + </Entry.SortBy> + </Entry> + <Entry DisplayName="Public Delegates" Priority="100"> + <Entry.Match> + <And> + <Access Is="Public" /> + <Kind Is="Delegate" /> + </And> + </Entry.Match> + <Entry.SortBy> + <Name /> + </Entry.SortBy> + </Entry> + <Entry DisplayName="Properties, Indexers"> + <Entry.Match> + <Or> + <Kind Is="Property" /> + <Kind Is="Indexer" /> + </Or> + </Entry.Match> + </Entry> + <Entry DisplayName="Constructors"> + <Entry.Match> + <Kind Is="Constructor" /> + </Entry.Match> + <Entry.SortBy> + <Static /> + </Entry.SortBy> + </Entry> + <Entry DisplayName="Interface Implementations" Priority="100"> + <Entry.Match> + <And> + <Kind Is="Member" /> + <ImplementsInterface /> + </And> + </Entry.Match> + <Entry.SortBy> + <ImplementsInterface Immediate="True" /> + </Entry.SortBy> + </Entry> + <Entry DisplayName="All other members" /> + <Entry DisplayName="Nested Types"> + <Entry.Match> + <Kind Is="Type" /> + </Entry.Match> + </Entry> + </TypePattern> +</Patterns> + True + False + False + True + False \ No newline at end of file From 693d4da10cfb720c1c27d7c83781621ed9798013 Mon Sep 17 00:00:00 2001 From: Gabriela Trutan Date: Thu, 24 Oct 2024 16:17:33 +0200 Subject: [PATCH 3/5] SLVS-1527 Cleanup .editorconfig --- .editorconfig | 55 +++++++++++---------------------------------------- 1 file changed, 12 insertions(+), 43 deletions(-) diff --git a/.editorconfig b/.editorconfig index 846ef81a1c..e90caa991c 100644 --- a/.editorconfig +++ b/.editorconfig @@ -33,20 +33,15 @@ indent_size = 2 [*.{ps1,bat,cmd}] indent_size = 4 -# Java code files -[*.java] -indent_size = 2 - -# Pom files -[pom.xml] -indent_size = 2 - # ---------------------------------------------------------------------------------------------------------------------- # Coding styles # ---------------------------------------------------------------------------------------------------------------------- -# Dotnet code style settings: -[*.{cs,vb}] +[*.cs] +# Use language keywords instead of framework type names for type references +dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion +dotnet_style_predefined_type_for_member_access = true:suggestion + # Sort using and Import directives with System.* appearing first dotnet_sort_system_directives_first = true # Avoid "this." and "Me." if not necessary @@ -54,15 +49,6 @@ dotnet_style_qualification_for_field = false:suggestion dotnet_style_qualification_for_property = false:suggestion dotnet_style_qualification_for_method = false:suggestion dotnet_style_qualification_for_event = false:suggestion - -csharp_style_inlined_variable_declaration = false:suggestion - -[*.cs] - -# Use language keywords instead of framework type names for type references -dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion -dotnet_style_predefined_type_for_member_access = true:suggestion - dotnet_style_require_accessibility_modifiers = for_non_interface_members:warning # Suggest more modern language features when available @@ -82,7 +68,7 @@ dotnet_style_prefer_simplified_interpolation = true:suggestion # Parentheses dotnet_style_parentheses_in_arithmetic_binary_operators = never_if_unnecessary:silent -dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent +dotnet_style_parentheses_in_relational_binary_operators = never_if_unnecessary:none dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:suggestion dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent @@ -153,7 +139,7 @@ csharp_space_after_semicolon_in_for_statement = true csharp_space_before_semicolon_in_for_statement = false # Extra space before equals sign DOES MATTER https://github.com/dotnet/roslyn/issues/20355 csharp_space_around_binary_operators = before_and_after -csharp_space_around_declaration_statements = do_not_ignore +csharp_space_around_declaration_statements = false csharp_space_before_open_square_brackets = false csharp_space_between_empty_square_brackets = false csharp_space_between_method_call_empty_parameter_list_parentheses = false @@ -172,7 +158,7 @@ csharp_preserve_single_line_blocks = true # Naming conventions should be ordered from most-specific to least-specific in the .editorconfig file. # The first rule encountered that can be applied is the only rule that is applied. -[*.{cs,vb}] +[*.cs] # Naming rules @@ -205,15 +191,13 @@ dotnet_naming_symbols.types.applicable_accessibilities = public, internal, priva dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected -# Naming styles - -dotnet_naming_style.pascal_case.capitalization = pascal_case - -dotnet_naming_style.camel_style.capitalization = camel_case - +# Define the naming style for interfaces dotnet_naming_style.I_style.required_prefix = I dotnet_naming_style.I_style.capitalization = pascal_case +# Define the naming rule that applies the naming style to the symbol group +dotnet_naming_rule.interface_naming.rule = interfaces + # ---------------------------------------------------------------------------------------------------------------------- # Rules # ---------------------------------------------------------------------------------------------------------------------- @@ -262,12 +246,7 @@ resharper_wrap_before_eq = true resharper_wrap_before_first_type_parameter_constraint = true # Microsoft .NET properties -csharp_new_line_before_members_in_object_initializers = false -csharp_preferred_modifier_order = public, private, protected, internal, file, new, static, abstract, virtual, sealed, readonly, override, extern, unsafe, volatile, async, required:suggestion csharp_style_prefer_utf8_string_literals = true:suggestion -csharp_style_var_elsewhere = true:suggestion -csharp_style_var_for_built_in_types = true:suggestion -csharp_style_var_when_type_is_apparent = true:suggestion dotnet_naming_rule.method_rule.import_to_resharper = True dotnet_naming_rule.method_rule.resharper_description = Methods dotnet_naming_rule.method_rule.resharper_guid = 8284009d-e743-4d89-9402-a5bf9a89b657 @@ -336,16 +315,6 @@ dotnet_naming_symbols.type_parameters_symbols.applicable_accessibilities = * dotnet_naming_symbols.type_parameters_symbols.applicable_kinds = type_parameter dotnet_naming_symbols.type_parameters_symbols.resharper_applicable_kinds = type_parameter dotnet_naming_symbols.type_parameters_symbols.resharper_required_modifiers = any -dotnet_style_parentheses_in_arithmetic_binary_operators = never_if_unnecessary:none -dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:none -dotnet_style_parentheses_in_relational_binary_operators = never_if_unnecessary:none -dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion -dotnet_style_predefined_type_for_member_access = true:suggestion -dotnet_style_qualification_for_event = false:suggestion -dotnet_style_qualification_for_field = false:suggestion -dotnet_style_qualification_for_method = false:suggestion -dotnet_style_qualification_for_property = false:suggestion -dotnet_style_require_accessibility_modifiers = for_non_interface_members:suggestion # ReSharper inspection severities resharper_arrange_redundant_parentheses_highlighting = hint From 9492472f2cd19ced7ff648f114f1eb2bad6df6e6 Mon Sep 17 00:00:00 2001 From: Gabriela Trutan Date: Thu, 24 Oct 2024 16:20:33 +0200 Subject: [PATCH 4/5] Cleanup resharper settings --- ...t.VisualStudio.Integration.sln.DotSettings | 105 ------------------ 1 file changed, 105 deletions(-) diff --git a/SonarLint.VisualStudio.Integration.sln.DotSettings b/SonarLint.VisualStudio.Integration.sln.DotSettings index a612275d9f..5f03c02e18 100644 --- a/SonarLint.VisualStudio.Integration.sln.DotSettings +++ b/SonarLint.VisualStudio.Integration.sln.DotSettings @@ -42,111 +42,6 @@ </Or> </TypePattern.Match> </TypePattern> - <TypePattern DisplayName="xUnit.net Test Classes" RemoveRegions="All"> - <TypePattern.Match> - <And> - <Kind Is="Class" /> - <HasMember> - <And> - <Kind Is="Method" /> - <HasAttribute Inherited="True" Name="Xunit.FactAttribute" /> - <HasAttribute Inherited="True" Name="Xunit.TheoryAttribute" /> - </And> - </HasMember> - </And> - </TypePattern.Match> - <Entry DisplayName="Fields"> - <Entry.Match> - <And> - <Kind Is="Field" /> - <Not> - <Static /> - </Not> - </And> - </Entry.Match> - <Entry.SortBy> - <Readonly /> - <Name /> - </Entry.SortBy> - </Entry> - <Entry DisplayName="Constructors"> - <Entry.Match> - <Kind Is="Constructor" /> - </Entry.Match> - <Entry.SortBy> - <Static /> - </Entry.SortBy> - </Entry> - <Entry DisplayName="Teardown Methods"> - <Entry.Match> - <And> - <Kind Is="Method" /> - <ImplementsInterface Name="System.IDisposable" /> - </And> - </Entry.Match> - </Entry> - <Entry DisplayName="All other members" /> - <Entry DisplayName="Test Methods" Priority="100"> - <Entry.Match> - <And> - <Kind Is="Method" /> - <HasAttribute Name="Xunit.FactAttribute" /> - <HasAttribute Name="Xunit.TheoryAttribute" /> - </And> - </Entry.Match> - <Entry.SortBy> - <Name /> - </Entry.SortBy> - </Entry> - </TypePattern> - <TypePattern DisplayName="NUnit Test Fixtures" RemoveRegions="All"> - <TypePattern.Match> - <And> - <Kind Is="Class" /> - <Or> - <HasAttribute Inherited="True" Name="NUnit.Framework.TestFixtureAttribute" /> - <HasAttribute Inherited="True" Name="NUnit.Framework.TestFixtureSourceAttribute" /> - <HasMember> - <And> - <Kind Is="Method" /> - <HasAttribute Name="NUnit.Framework.TestAttribute" /> - <HasAttribute Name="NUnit.Framework.TestCaseAttribute" /> - <HasAttribute Name="NUnit.Framework.TestCaseSourceAttribute" /> - </And> - </HasMember> - </Or> - </And> - </TypePattern.Match> - <Entry DisplayName="Setup/Teardown Methods"> - <Entry.Match> - <And> - <Kind Is="Method" /> - <Or> - <HasAttribute Inherited="True" Name="NUnit.Framework.SetUpAttribute" /> - <HasAttribute Inherited="True" Name="NUnit.Framework.TearDownAttribute" /> - <HasAttribute Inherited="True" Name="NUnit.Framework.TestFixtureSetUpAttribute" /> - <HasAttribute Inherited="True" Name="NUnit.Framework.TestFixtureTearDownAttribute" /> - <HasAttribute Inherited="True" Name="NUnit.Framework.OneTimeSetUpAttribute" /> - <HasAttribute Inherited="True" Name="NUnit.Framework.OneTimeTearDownAttribute" /> - </Or> - </And> - </Entry.Match> - </Entry> - <Entry DisplayName="All other members" /> - <Entry DisplayName="Test Methods" Priority="100"> - <Entry.Match> - <And> - <Kind Is="Method" /> - <HasAttribute Name="NUnit.Framework.TestAttribute" /> - <HasAttribute Name="NUnit.Framework.TestCaseAttribute" /> - <HasAttribute Name="NUnit.Framework.TestCaseSourceAttribute" /> - </And> - </Entry.Match> - <Entry.SortBy> - <Name /> - </Entry.SortBy> - </Entry> - </TypePattern> <TypePattern DisplayName="Default Pattern"> <Entry DisplayName="Static Fields and Constants"> <Entry.Match> From 3ae97d063affd35faa7ad72b76f0dca5fab1ea94 Mon Sep 17 00:00:00 2001 From: Gabriela Trutan Date: Thu, 24 Oct 2024 16:26:18 +0200 Subject: [PATCH 5/5] Combine all regions into one --- .editorconfig | 3 --- 1 file changed, 3 deletions(-) diff --git a/.editorconfig b/.editorconfig index e90caa991c..dd9d3f9234 100644 --- a/.editorconfig +++ b/.editorconfig @@ -73,7 +73,6 @@ dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:suggesti dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent # CSharp code style settings: -[*.cs] csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:warning csharp_prefer_braces = true:warning @@ -158,8 +157,6 @@ csharp_preserve_single_line_blocks = true # Naming conventions should be ordered from most-specific to least-specific in the .editorconfig file. # The first rule encountered that can be applied is the only rule that is applied. -[*.cs] - # Naming rules dotnet_naming_rule.interface_must_start_with_I.severity = warning