Skip to content

Commit dd24f9a

Browse files
authored
Code style cleanup (#271)
* Code cleanup and code style enhancement * Oops * Fix default provider type * fix error * Throw better error if GetMostRecentCompatibleProviders doesn't find anything
1 parent 1de9eb4 commit dd24f9a

271 files changed

Lines changed: 13792 additions & 12017 deletions

File tree

Some content is hidden

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

.editorconfig

Lines changed: 281 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,281 @@
1+
# Remove the line below if you want to inherit .editorconfig settings from higher directories
2+
root = true
3+
4+
# C# files
5+
[*.cs]
6+
7+
#### Core EditorConfig Options ####
8+
9+
# Indentation and spacing
10+
indent_size = 4
11+
indent_style = space
12+
tab_width = 4
13+
14+
# New line preferences
15+
end_of_line = crlf
16+
insert_final_newline = false
17+
18+
#### .NET Code Actions ####
19+
20+
# Type members
21+
dotnet_hide_advanced_members = false
22+
dotnet_member_insertion_location = with_other_members_of_the_same_kind
23+
dotnet_property_generation_behavior = prefer_throwing_properties
24+
25+
# Symbol search
26+
dotnet_search_reference_assemblies = true
27+
28+
#### .NET Coding Conventions ####
29+
30+
# Organize usings
31+
dotnet_separate_import_directive_groups = false
32+
dotnet_sort_system_directives_first = false
33+
file_header_template = unset
34+
35+
# this. and Me. preferences
36+
dotnet_style_qualification_for_event = false
37+
dotnet_style_qualification_for_field = false
38+
dotnet_style_qualification_for_method = false
39+
dotnet_style_qualification_for_property = false
40+
41+
# Language keywords vs BCL types preferences
42+
dotnet_style_predefined_type_for_locals_parameters_members = true
43+
dotnet_style_predefined_type_for_member_access = true
44+
45+
# Parentheses preferences
46+
dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity
47+
dotnet_style_parentheses_in_other_binary_operators = always_for_clarity
48+
dotnet_style_parentheses_in_other_operators = never_if_unnecessary
49+
dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity
50+
51+
# Modifier preferences
52+
dotnet_style_require_accessibility_modifiers = for_non_interface_members
53+
54+
# Expression-level preferences
55+
dotnet_prefer_system_hash_code = true
56+
dotnet_style_coalesce_expression = true
57+
dotnet_style_collection_initializer = true
58+
dotnet_style_explicit_tuple_names = true
59+
dotnet_style_namespace_match_folder = true
60+
dotnet_style_null_propagation = true
61+
dotnet_style_object_initializer = true
62+
dotnet_style_operator_placement_when_wrapping = beginning_of_line
63+
dotnet_style_prefer_auto_properties = true
64+
dotnet_style_prefer_collection_expression = when_types_loosely_match
65+
dotnet_style_prefer_compound_assignment = true
66+
dotnet_style_prefer_conditional_expression_over_assignment = true
67+
dotnet_style_prefer_conditional_expression_over_return = true
68+
dotnet_style_prefer_foreach_explicit_cast_in_source = when_strongly_typed
69+
dotnet_style_prefer_inferred_anonymous_type_member_names = true
70+
dotnet_style_prefer_inferred_tuple_names = true
71+
dotnet_style_prefer_is_null_check_over_reference_equality_method = true
72+
dotnet_style_prefer_simplified_boolean_expressions = true
73+
dotnet_style_prefer_simplified_interpolation = true
74+
75+
# Field preferences
76+
dotnet_style_readonly_field = true
77+
78+
# Parameter preferences
79+
dotnet_code_quality_unused_parameters = all
80+
81+
# Suppression preferences
82+
dotnet_remove_unnecessary_suppression_exclusions = none
83+
84+
# New line preferences
85+
dotnet_style_allow_multiple_blank_lines_experimental = true
86+
dotnet_style_allow_statement_immediately_after_block_experimental = true
87+
88+
#### C# Coding Conventions ####
89+
90+
# var preferences
91+
csharp_style_var_elsewhere = false:silent
92+
csharp_style_var_for_built_in_types = false:silent
93+
csharp_style_var_when_type_is_apparent = false:silent
94+
95+
# Expression-bodied members
96+
csharp_style_expression_bodied_accessors = true:silent
97+
csharp_style_expression_bodied_constructors = false:silent
98+
csharp_style_expression_bodied_indexers = true:silent
99+
csharp_style_expression_bodied_lambdas = true:silent
100+
csharp_style_expression_bodied_local_functions = false:silent
101+
csharp_style_expression_bodied_methods = false:silent
102+
csharp_style_expression_bodied_operators = false:silent
103+
csharp_style_expression_bodied_properties = true:silent
104+
105+
# Pattern matching preferences
106+
csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
107+
csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
108+
csharp_style_prefer_extended_property_pattern = true:suggestion
109+
csharp_style_prefer_not_pattern = true:suggestion
110+
csharp_style_prefer_pattern_matching = true:silent
111+
csharp_style_prefer_switch_expression = true:suggestion
112+
113+
# Null-checking preferences
114+
csharp_style_conditional_delegate_call = true:suggestion
115+
116+
# Modifier preferences
117+
csharp_prefer_static_anonymous_function = true:suggestion
118+
csharp_prefer_static_local_function = true:suggestion
119+
csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async
120+
csharp_style_prefer_readonly_struct = true:suggestion
121+
csharp_style_prefer_readonly_struct_member = true:suggestion
122+
123+
# Code-block preferences
124+
csharp_prefer_braces = true:silent
125+
csharp_prefer_simple_using_statement = true:suggestion
126+
csharp_prefer_system_threading_lock = true:suggestion
127+
csharp_style_namespace_declarations = block_scoped:silent
128+
csharp_style_prefer_method_group_conversion = true:silent
129+
csharp_style_prefer_primary_constructors = true:suggestion
130+
csharp_style_prefer_top_level_statements = true:silent
131+
132+
# Expression-level preferences
133+
csharp_prefer_simple_default_expression = true:suggestion
134+
csharp_style_deconstructed_variable_declaration = true:suggestion
135+
csharp_style_implicit_object_creation_when_type_is_apparent = true:suggestion
136+
csharp_style_inlined_variable_declaration = true:suggestion
137+
csharp_style_prefer_index_operator = true:suggestion
138+
csharp_style_prefer_local_over_anonymous_function = true:suggestion
139+
csharp_style_prefer_null_check_over_type_check = true:suggestion
140+
csharp_style_prefer_range_operator = true:suggestion
141+
csharp_style_prefer_tuple_swap = true:suggestion
142+
csharp_style_prefer_utf8_string_literals = false:suggestion
143+
csharp_style_throw_expression = true:suggestion
144+
csharp_style_unused_value_assignment_preference = discard_variable:suggestion
145+
csharp_style_unused_value_expression_statement_preference = discard_variable:silent
146+
147+
# 'using' directive preferences
148+
csharp_using_directive_placement = outside_namespace:silent
149+
150+
# New line preferences
151+
csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = true:silent
152+
csharp_style_allow_blank_line_after_token_in_arrow_expression_clause_experimental = true:silent
153+
csharp_style_allow_blank_line_after_token_in_conditional_expression_experimental = true:silent
154+
csharp_style_allow_blank_lines_between_consecutive_braces_experimental = true:silent
155+
csharp_style_allow_embedded_statements_on_same_line_experimental = true:silent
156+
157+
#### C# Formatting Rules ####
158+
159+
# New line preferences
160+
csharp_new_line_before_catch = true
161+
csharp_new_line_before_else = true
162+
csharp_new_line_before_finally = true
163+
csharp_new_line_before_members_in_anonymous_types = true
164+
csharp_new_line_before_members_in_object_initializers = true
165+
csharp_new_line_before_open_brace = all
166+
csharp_new_line_between_query_expression_clauses = true
167+
168+
# Indentation preferences
169+
csharp_indent_block_contents = true
170+
csharp_indent_braces = false
171+
csharp_indent_case_contents = true
172+
csharp_indent_case_contents_when_block = true
173+
csharp_indent_labels = one_less_than_current
174+
csharp_indent_switch_labels = true
175+
176+
# Space preferences
177+
csharp_space_after_cast = false
178+
csharp_space_after_colon_in_inheritance_clause = true
179+
csharp_space_after_comma = true
180+
csharp_space_after_dot = false
181+
csharp_space_after_keywords_in_control_flow_statements = true
182+
csharp_space_after_semicolon_in_for_statement = true
183+
csharp_space_around_binary_operators = before_and_after
184+
csharp_space_around_declaration_statements = false
185+
csharp_space_before_colon_in_inheritance_clause = true
186+
csharp_space_before_comma = false
187+
csharp_space_before_dot = false
188+
csharp_space_before_open_square_brackets = false
189+
csharp_space_before_semicolon_in_for_statement = false
190+
csharp_space_between_empty_square_brackets = false
191+
csharp_space_between_method_call_empty_parameter_list_parentheses = false
192+
csharp_space_between_method_call_name_and_opening_parenthesis = false
193+
csharp_space_between_method_call_parameter_list_parentheses = false
194+
csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
195+
csharp_space_between_method_declaration_name_and_open_parenthesis = false
196+
csharp_space_between_method_declaration_parameter_list_parentheses = false
197+
csharp_space_between_parentheses = false
198+
csharp_space_between_square_brackets = false
199+
200+
# Wrapping preferences
201+
csharp_preserve_single_line_blocks = true
202+
csharp_preserve_single_line_statements = true
203+
204+
#### Naming styles ####
205+
206+
# Naming rules
207+
208+
dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion
209+
dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface
210+
dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i
211+
212+
dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion
213+
dotnet_naming_rule.types_should_be_pascal_case.symbols = types
214+
dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case
215+
216+
dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion
217+
dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members
218+
dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case
219+
220+
# Symbol specifications
221+
222+
dotnet_naming_symbols.interface.applicable_kinds = interface
223+
dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
224+
dotnet_naming_symbols.interface.required_modifiers =
225+
226+
dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
227+
dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
228+
dotnet_naming_symbols.types.required_modifiers =
229+
230+
dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
231+
dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
232+
dotnet_naming_symbols.non_field_members.required_modifiers =
233+
234+
# Naming styles
235+
236+
dotnet_naming_style.pascal_case.required_prefix =
237+
dotnet_naming_style.pascal_case.required_suffix =
238+
dotnet_naming_style.pascal_case.word_separator =
239+
dotnet_naming_style.pascal_case.capitalization = pascal_case
240+
241+
dotnet_naming_style.begins_with_i.required_prefix = I
242+
dotnet_naming_style.begins_with_i.required_suffix =
243+
dotnet_naming_style.begins_with_i.word_separator =
244+
dotnet_naming_style.begins_with_i.capitalization = pascal_case
245+
246+
[*.{cs,vb}]
247+
dotnet_style_coalesce_expression = true:suggestion
248+
dotnet_style_null_propagation = true:suggestion
249+
dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion
250+
dotnet_style_prefer_auto_properties = true:silent
251+
dotnet_style_object_initializer = true:suggestion
252+
dotnet_style_collection_initializer = true:suggestion
253+
dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
254+
dotnet_style_prefer_conditional_expression_over_assignment = true:silent
255+
dotnet_style_prefer_conditional_expression_over_return = true:silent
256+
dotnet_style_explicit_tuple_names = true:suggestion
257+
dotnet_style_prefer_inferred_tuple_names = true:suggestion
258+
dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
259+
dotnet_style_prefer_compound_assignment = true:suggestion
260+
dotnet_style_operator_placement_when_wrapping = beginning_of_line
261+
tab_width = 4
262+
indent_size = 4
263+
end_of_line = crlf
264+
dotnet_style_prefer_simplified_interpolation = true:suggestion
265+
dotnet_style_prefer_collection_expression = when_types_loosely_match:suggestion
266+
dotnet_style_namespace_match_folder = true:suggestion
267+
dotnet_style_readonly_field = true:suggestion
268+
dotnet_style_predefined_type_for_locals_parameters_members = true:silent
269+
dotnet_style_predefined_type_for_member_access = true:silent
270+
dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
271+
dotnet_style_allow_multiple_blank_lines_experimental = true:silent
272+
dotnet_style_allow_statement_immediately_after_block_experimental = true:silent
273+
dotnet_code_quality_unused_parameters = all:suggestion
274+
dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent
275+
dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent
276+
dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent
277+
dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent
278+
dotnet_style_qualification_for_field = false:silent
279+
dotnet_style_qualification_for_property = false:silent
280+
dotnet_style_qualification_for_method = false:silent
281+
dotnet_style_qualification_for_event = false:silent

EFCore.Jet.sln

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{B7FF1850-2
3131
EndProject
3232
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "root", "root", "{76210BB4-A506-4838-8BBF-57DA18C8FA03}"
3333
ProjectSection(SolutionItems) = preProject
34+
.gitignore = .gitignore
3435
Dependencies.targets = Dependencies.targets
3536
Development.props.sample = Development.props.sample
3637
Directory.Build.props = Directory.Build.props
@@ -40,7 +41,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "root", "root", "{76210BB4-A
4041
NuGet.Config = NuGet.Config
4142
docs\README.md = docs\README.md
4243
Version.props = Version.props
43-
.gitignore = .gitignore
4444
EndProjectSection
4545
EndProject
4646
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Jet.Tests", "test\EFCore.Jet.Tests\EFCore.Jet.Tests.csproj", "{770A076B-A448-499C-BB86-A37994C04523}"
@@ -56,6 +56,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Jet.Odbc", "src\EFCo
5656
EndProject
5757
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Jet.OleDb", "src\EFCore.Jet.OleDb\EFCore.Jet.OleDb.csproj", "{FFC89A2D-F68F-47E3-BA00-47E9C0BEDB71}"
5858
EndProject
59+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{05A38BCD-0042-446F-8E89-84090230BE76}"
60+
ProjectSection(SolutionItems) = preProject
61+
.editorconfig = .editorconfig
62+
EndProjectSection
63+
EndProject
5964
Global
6065
GlobalSection(SolutionConfigurationPlatforms) = preSolution
6166
Debug|Any CPU = Debug|Any CPU

src/EFCore.Jet.Data/AdoxSchema.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ public override DataTable GetColumns()
177177
{
178178
using (var recordset = _connection.OpenSchema(SchemaEnum.adSchemaColumns))
179179
{
180-
ordinalPositions = new Dictionary<(string TableName, string ColumnName), int>();
180+
ordinalPositions = [];
181181

182182
using var fields = recordset.Fields;
183183
using var tableNameField = fields["TABLE_NAME"];

src/EFCore.Jet.Data/ComObject.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public override bool TryGetMember(GetMemberBinder binder, out object? result)
8686
BindingFlags.GetProperty,
8787
Type.DefaultBinder,
8888
_instance,
89-
new object[0]
89+
[]
9090
));
9191
return true;
9292
}
@@ -99,12 +99,11 @@ public override bool TrySetMember(SetMemberBinder binder, object? value)
9999
BindingFlags.SetProperty,
100100
Type.DefaultBinder,
101101
_instance,
102-
new[]
103-
{
102+
[
104103
value is ComObject comObject
105104
? comObject._instance
106105
: value
107-
}
106+
]
108107
);
109108
return true;
110109
}

src/EFCore.Jet.Data/ConnectionPooling/ConnectionSet.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class ConnectionSet(string connectionString) : IDisposable
88
public string ConnectionString { get; } = connectionString;
99

1010
private DbConnection[] _connections = new DbConnection[10];
11-
public int ConnectionCount { get; private set; } = 0;
11+
public int ConnectionCount { get; private set; }
1212

1313
public void AddConnection(DbConnection connection)
1414
{

src/EFCore.Jet.Data/ConnectionPooling/ConnectionSetCollection.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ protected override string GetKeyForItem(ConnectionSet item)
1616

1717
// TryGetValue has been added in .NET Core 2.0.
1818
#pragma warning disable 109
19-
public new bool TryGetValue(string key, out ConnectionSet connectionSet)
19+
public new bool TryGetValue(string key, out ConnectionSet? connectionSet)
2020
{
2121
try
2222
{

src/EFCore.Jet.Data/DaoDatabaseCreator.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ public override void CreateDatabase(
1313
CollatingOrder collatingOrder = CollatingOrder.General,
1414
string? databasePassword = null)
1515
{
16-
if (databasePassword != null &&
17-
databasePassword.Length > 20)
16+
if (databasePassword is { Length: > 20 })
1817
{
1918
throw new ArgumentOutOfRangeException(nameof(databasePassword));
2019
}
@@ -92,7 +91,7 @@ private static dynamic CreateDbEngine()
9291
.Select(n => n * 10)
9392
.Concat(
9493
Environment.Is64BitProcess
95-
? new int[0]
94+
? []
9695
: new[] {36}) // DAO 3.6 is only available as an x86 library
9796
.Select(n => "DAO.DBEngine." + n)
9897
.ToArray();

src/EFCore.Jet.Data/DaoSchema.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public DaoSchema(JetConnection connection, bool readOnly)
2828
_dbEngine = ComObject.CreateFirstFrom(
2929
Enumerable.Range(12, 6)
3030
.Reverse()
31-
.Concat(new[] { 36 })
31+
.Concat([36])
3232
.Select(n => "DAO.DBEngine." + (n * 10).ToString())
3333
.ToArray());
3434

src/EFCore.Jet.Data/DataAccessType.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ public enum DataAccessProviderType
44
{
55
Odbc,
66
OleDb,
7-
Unconfgiured
7+
Unconfigured
88
};
99
}

0 commit comments

Comments
 (0)