Skip to content

Commit 49466b0

Browse files
committed
maint: apply code formatting rules to pass CI linter (#327)
1 parent 60a55e5 commit 49466b0

File tree

140 files changed

+12181
-7285
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

140 files changed

+12181
-7285
lines changed

.editorconfig

+90-200
Original file line numberDiff line numberDiff line change
@@ -1,239 +1,129 @@
1-
# Remove the line below if you want to inherit .editorconfig settings from higher directories
21
root = true
32

4-
# C# files
5-
[*.cs]
6-
7-
#### Core EditorConfig Options ####
3+
###############################
4+
# Core EditorConfig Options #
5+
###############################
6+
# https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/code-style-rule-options
87

9-
# Indentation and spacing
8+
# All files
9+
[*]
1010
indent_style = space
1111

12-
# New line preferences
13-
insert_final_newline = true
12+
# XML project files
13+
[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj}]
14+
indent_size = 2
1415

15-
#### .NET Coding Conventions ####
16+
# XML config files
17+
[*.{props,targets,ruleset,config,nuspec,resx,vsixmanifest,vsct}]
18+
indent_size = 2
1619

20+
# Code files
21+
[*.{cs,csx,vb,vbx}]
22+
indent_size = 4
23+
insert_final_newline = true
24+
charset = utf-8-bom
25+
###############################
26+
# .NET Coding Conventions #
27+
###############################
28+
[*.{cs,vb}]
1729
# Organize usings
18-
dotnet_separate_import_directive_groups = false
19-
dotnet_sort_system_directives_first = false
20-
file_header_template = unset
21-
22-
# this. and Me. preferences
23-
dotnet_style_qualification_for_event = false
24-
dotnet_style_qualification_for_field = false
25-
dotnet_style_qualification_for_method = false
26-
dotnet_style_qualification_for_property = false
27-
30+
dotnet_sort_system_directives_first = true
31+
# this. preferences
32+
dotnet_style_qualification_for_field = false:silent
33+
dotnet_style_qualification_for_property = false:silent
34+
dotnet_style_qualification_for_method = false:silent
35+
dotnet_style_qualification_for_event = false:silent
2836
# Language keywords vs BCL types preferences
29-
dotnet_style_predefined_type_for_locals_parameters_members = true
30-
dotnet_style_predefined_type_for_member_access = true
31-
37+
dotnet_style_predefined_type_for_locals_parameters_members = true:silent
38+
dotnet_style_predefined_type_for_member_access = true:silent
3239
# Parentheses preferences
33-
dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity
34-
dotnet_style_parentheses_in_other_binary_operators = always_for_clarity
35-
dotnet_style_parentheses_in_other_operators = never_if_unnecessary
36-
dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity
37-
40+
dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent
41+
dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent
42+
dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent
43+
dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent
3844
# Modifier preferences
39-
dotnet_style_require_accessibility_modifiers = for_non_interface_members
40-
45+
dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
46+
dotnet_style_readonly_field = true:suggestion
4147
# Expression-level preferences
42-
dotnet_style_coalesce_expression = true
43-
dotnet_style_collection_initializer = true
44-
dotnet_style_explicit_tuple_names = true
45-
dotnet_style_namespace_match_folder = true
46-
dotnet_style_null_propagation = true
47-
dotnet_style_object_initializer = true
48-
dotnet_style_operator_placement_when_wrapping = beginning_of_line
49-
dotnet_style_prefer_auto_properties = true
50-
dotnet_style_prefer_compound_assignment = true
51-
dotnet_style_prefer_conditional_expression_over_assignment = true
52-
dotnet_style_prefer_conditional_expression_over_return = true
53-
dotnet_style_prefer_inferred_anonymous_type_member_names = true
54-
dotnet_style_prefer_inferred_tuple_names = true
55-
dotnet_style_prefer_is_null_check_over_reference_equality_method = true
56-
dotnet_style_prefer_simplified_boolean_expressions = true
57-
dotnet_style_prefer_simplified_interpolation = true
58-
59-
# Field preferences
60-
dotnet_style_readonly_field = true
61-
62-
# Parameter preferences
63-
dotnet_code_quality_unused_parameters = all
64-
65-
# Suppression preferences
66-
dotnet_remove_unnecessary_suppression_exclusions = none
67-
68-
# New line preferences
69-
dotnet_style_allow_multiple_blank_lines_experimental = true
70-
dotnet_style_allow_statement_immediately_after_block_experimental = true
71-
72-
#### C# Coding Conventions ####
73-
48+
dotnet_style_object_initializer = true:suggestion
49+
dotnet_style_collection_initializer = true:suggestion
50+
dotnet_style_explicit_tuple_names = true:suggestion
51+
dotnet_style_null_propagation = true:suggestion
52+
dotnet_style_coalesce_expression = true:suggestion
53+
dotnet_style_prefer_is_null_check_over_reference_equality_method = true:silent
54+
dotnet_style_prefer_inferred_tuple_names = true:suggestion
55+
dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
56+
dotnet_style_prefer_auto_properties = true:silent
57+
dotnet_style_prefer_conditional_expression_over_assignment = true:silent
58+
dotnet_style_prefer_conditional_expression_over_return = true:silent
59+
###############################
60+
# Naming Conventions #
61+
###############################
62+
# Style Definitions
63+
dotnet_naming_style.pascal_case_style.capitalization = pascal_case
64+
# Use PascalCase for constant fields
65+
dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion
66+
dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols = constant_fields
67+
dotnet_naming_rule.constant_fields_should_be_pascal_case.style = pascal_case_style
68+
dotnet_naming_symbols.constant_fields.applicable_kinds = field
69+
dotnet_naming_symbols.constant_fields.applicable_accessibilities = *
70+
dotnet_naming_symbols.constant_fields.required_modifiers = const
71+
###############################
72+
# C# Coding Conventions #
73+
###############################
74+
[*.cs]
7475
# var preferences
75-
csharp_style_var_elsewhere = false
76-
csharp_style_var_for_built_in_types = false
77-
csharp_style_var_when_type_is_apparent = false
78-
76+
csharp_style_var_for_built_in_types = true:silent
77+
csharp_style_var_when_type_is_apparent = true:silent
78+
csharp_style_var_elsewhere = true:silent
7979
# Expression-bodied members
80-
csharp_style_expression_bodied_accessors = true:silent
81-
csharp_style_expression_bodied_constructors = false:silent
82-
csharp_style_expression_bodied_indexers = true:silent
83-
csharp_style_expression_bodied_lambdas = true:silent
84-
csharp_style_expression_bodied_local_functions = false:silent
8580
csharp_style_expression_bodied_methods = false:silent
81+
csharp_style_expression_bodied_constructors = false:silent
8682
csharp_style_expression_bodied_operators = false:silent
8783
csharp_style_expression_bodied_properties = true:silent
88-
84+
csharp_style_expression_bodied_indexers = true:silent
85+
csharp_style_expression_bodied_accessors = true:silent
8986
# Pattern matching preferences
90-
csharp_style_pattern_matching_over_as_with_null_check = true
91-
csharp_style_pattern_matching_over_is_with_cast_check = true
92-
csharp_style_prefer_extended_property_pattern = true
93-
csharp_style_prefer_not_pattern = true
94-
csharp_style_prefer_pattern_matching = true
95-
csharp_style_prefer_switch_expression = true
96-
87+
csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
88+
csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
9789
# Null-checking preferences
98-
csharp_style_conditional_delegate_call = true
99-
90+
csharp_style_throw_expression = true:suggestion
91+
csharp_style_conditional_delegate_call = true:suggestion
10092
# Modifier preferences
101-
csharp_prefer_static_local_function = true
102-
csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async
103-
104-
# Code-block preferences
105-
csharp_prefer_braces = true:silent
106-
csharp_prefer_simple_using_statement = true:suggestion
107-
csharp_style_namespace_declarations = block_scoped:silent
108-
93+
csharp_preferred_modifier_order = public, private, protected, internal, static, extern, new, virtual, abstract, sealed, override, readonly, unsafe, volatile, async:suggestion
10994
# Expression-level preferences
95+
csharp_prefer_braces = true:silent
96+
csharp_style_deconstructed_variable_declaration = true:suggestion
11097
csharp_prefer_simple_default_expression = true:suggestion
111-
csharp_style_deconstructed_variable_declaration = true
112-
csharp_style_implicit_object_creation_when_type_is_apparent = true
113-
csharp_style_inlined_variable_declaration = true
114-
csharp_style_prefer_index_operator = true
11598
csharp_style_prefer_local_over_anonymous_function = true:suggestion
116-
csharp_style_prefer_null_check_over_type_check = true:suggestion
117-
csharp_style_prefer_range_operator = true
118-
csharp_style_prefer_tuple_swap = true
119-
csharp_style_throw_expression = true:suggestion
120-
csharp_style_unused_value_assignment_preference = discard_variable
121-
csharp_style_unused_value_expression_statement_preference = discard_variable
122-
123-
# 'using' directive preferences
124-
csharp_using_directive_placement = outside_namespace:silent
125-
99+
csharp_style_inlined_variable_declaration = true:suggestion
100+
###############################
101+
# C# Formatting Rules #
102+
###############################
126103
# New line preferences
127-
csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = true
128-
csharp_style_allow_blank_lines_between_consecutive_braces_experimental = true
129-
csharp_style_allow_embedded_statements_on_same_line_experimental = true
130-
131-
#### C# Formatting Rules ####
132-
133-
# New line preferences
134-
csharp_new_line_before_catch = true
104+
csharp_new_line_before_open_brace = all
135105
csharp_new_line_before_else = true
106+
csharp_new_line_before_catch = true
136107
csharp_new_line_before_finally = true
108+
csharp_new_line_before_members_in_object_initializers = false
137109
csharp_new_line_before_members_in_anonymous_types = true
138-
csharp_new_line_before_members_in_object_initializers = true
139-
csharp_new_line_before_open_brace = all
140110
csharp_new_line_between_query_expression_clauses = true
141-
142111
# Indentation preferences
143-
csharp_indent_block_contents = true
144-
csharp_indent_braces = false
145112
csharp_indent_case_contents = true
146-
csharp_indent_case_contents_when_block = true
147-
csharp_indent_labels = one_less_than_current
148113
csharp_indent_switch_labels = true
149-
114+
csharp_indent_labels = flush_left
150115
# Space preferences
151116
csharp_space_after_cast = false
152-
csharp_space_after_colon_in_inheritance_clause = true
153-
csharp_space_after_comma = true
154-
csharp_space_after_dot = false
155117
csharp_space_after_keywords_in_control_flow_statements = true
156-
csharp_space_after_semicolon_in_for_statement = true
157-
csharp_space_around_binary_operators = before_and_after
158-
csharp_space_around_declaration_statements = false
159-
csharp_space_before_colon_in_inheritance_clause = true
160-
csharp_space_before_comma = false
161-
csharp_space_before_dot = false
162-
csharp_space_before_open_square_brackets = false
163-
csharp_space_before_semicolon_in_for_statement = false
164-
csharp_space_between_empty_square_brackets = false
165-
csharp_space_between_method_call_empty_parameter_list_parentheses = false
166-
csharp_space_between_method_call_name_and_opening_parenthesis = false
167118
csharp_space_between_method_call_parameter_list_parentheses = false
168-
csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
169-
csharp_space_between_method_declaration_name_and_open_parenthesis = false
170119
csharp_space_between_method_declaration_parameter_list_parentheses = false
171120
csharp_space_between_parentheses = false
172-
csharp_space_between_square_brackets = false
173-
121+
csharp_space_before_colon_in_inheritance_clause = true
122+
csharp_space_after_colon_in_inheritance_clause = true
123+
csharp_space_around_binary_operators = before_and_after
124+
csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
125+
csharp_space_between_method_call_name_and_opening_parenthesis = false
126+
csharp_space_between_method_call_empty_parameter_list_parentheses = false
174127
# Wrapping preferences
175-
csharp_preserve_single_line_blocks = true
176128
csharp_preserve_single_line_statements = true
177-
178-
#### Naming styles ####
179-
180-
# Naming rules
181-
182-
dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion
183-
dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface
184-
dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i
185-
186-
dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion
187-
dotnet_naming_rule.types_should_be_pascal_case.symbols = types
188-
dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case
189-
190-
dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion
191-
dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members
192-
dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case
193-
194-
# Symbol specifications
195-
196-
dotnet_naming_symbols.interface.applicable_kinds = interface
197-
dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
198-
dotnet_naming_symbols.interface.required_modifiers =
199-
200-
dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
201-
dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
202-
dotnet_naming_symbols.types.required_modifiers =
203-
204-
dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
205-
dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
206-
dotnet_naming_symbols.non_field_members.required_modifiers =
207-
208-
# Naming styles
209-
210-
dotnet_naming_style.pascal_case.required_prefix =
211-
dotnet_naming_style.pascal_case.required_suffix =
212-
dotnet_naming_style.pascal_case.word_separator =
213-
dotnet_naming_style.pascal_case.capitalization = pascal_case
214-
215-
dotnet_naming_style.begins_with_i.required_prefix = I
216-
dotnet_naming_style.begins_with_i.required_suffix =
217-
dotnet_naming_style.begins_with_i.word_separator =
218-
dotnet_naming_style.begins_with_i.capitalization = pascal_case
219-
220-
[*.{cs,vb}]
221-
dotnet_style_operator_placement_when_wrapping = beginning_of_line
222-
tab_width = 4
223-
indent_size = 4
224-
end_of_line = lf
225-
dotnet_style_coalesce_expression = true:suggestion
226-
dotnet_style_null_propagation = true:suggestion
227-
dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion
228-
dotnet_style_prefer_auto_properties = true:silent
229-
dotnet_style_object_initializer = true:suggestion
230-
dotnet_style_collection_initializer = true:suggestion
231-
dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
232-
dotnet_style_prefer_conditional_expression_over_assignment = true:silent
233-
dotnet_style_prefer_conditional_expression_over_return = true:silent
234-
dotnet_style_explicit_tuple_names = true:suggestion
235-
dotnet_style_prefer_inferred_tuple_names = true:suggestion
236-
dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
237-
dotnet_style_prefer_compound_assignment = true:suggestion
238-
dotnet_style_prefer_simplified_interpolation = true:suggestion
239-
dotnet_style_namespace_match_folder = true:suggestion
129+
csharp_preserve_single_line_blocks = true

OptimizelySDK.Tests/App.config

+24-24
Original file line numberDiff line numberDiff line change
@@ -5,31 +5,31 @@
55
-->
66
<configuration>
77

8-
<configSections>
9-
<section name="optlySDKConfigSection"
10-
type="OptimizelySDK.OptimizelySDKConfigSection, OptimizelySDK" />
11-
</configSections>
12-
13-
<optlySDKConfigSection>
14-
15-
<HttpProjectConfig sdkKey="43214321"
16-
url="www.testurl.com"
17-
format="https://cdn.optimizely.com/data/{0}.json"
18-
pollingInterval="2000"
19-
blockingTimeOutPeriod="10000"
20-
datafileAccessToken="testingtoken123"
21-
autoUpdate="true"
22-
defaultStart="true">
23-
</HttpProjectConfig>
8+
<configSections>
9+
<section name="optlySDKConfigSection"
10+
type="OptimizelySDK.OptimizelySDKConfigSection, OptimizelySDK"/>
11+
</configSections>
12+
13+
<optlySDKConfigSection>
14+
15+
<HttpProjectConfig sdkKey="43214321"
16+
url="www.testurl.com"
17+
format="https://cdn.optimizely.com/data/{0}.json"
18+
pollingInterval="2000"
19+
blockingTimeOutPeriod="10000"
20+
datafileAccessToken="testingtoken123"
21+
autoUpdate="true"
22+
defaultStart="true">
23+
</HttpProjectConfig>
24+
25+
<BatchEventProcessor batchSize="10"
26+
flushInterval="2000"
27+
timeoutInterval="10000"
28+
defaultStart="true">
29+
</BatchEventProcessor>
30+
31+
</optlySDKConfigSection>
2432

25-
<BatchEventProcessor batchSize="10"
26-
flushInterval="2000"
27-
timeoutInterval="10000"
28-
defaultStart="true">
29-
</BatchEventProcessor>
30-
31-
</optlySDKConfigSection>
32-
3333
<connectionStrings>
3434

3535
</connectionStrings>

0 commit comments

Comments
 (0)