Skip to content

Commit 6321022

Browse files
TheJoeFinTheJoeFin
authored
Merge pull request #430 from TheJoeFin/dev
Dev 4.4
2 parents ee6e647 + d3b15e1 commit 6321022

32 files changed

+2379
-1159
lines changed

‎.editorconfig

+226-7
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,231 @@
1-
[*.cs]
1+
# Remove the line below if you want to inherit .editorconfig settings from higher directories
2+
root = true
23

3-
# IDE0011: Add braces
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 Coding Conventions ####
19+
20+
# Organize usings
21+
dotnet_separate_import_directive_groups = false
22+
dotnet_sort_system_directives_first = false
23+
file_header_template = unset
24+
25+
# this. and Me. preferences
26+
dotnet_style_qualification_for_event = false
27+
dotnet_style_qualification_for_field = false
28+
dotnet_style_qualification_for_method = false
29+
dotnet_style_qualification_for_property = false
30+
31+
# Language keywords vs BCL types preferences
32+
dotnet_style_predefined_type_for_locals_parameters_members = true
33+
dotnet_style_predefined_type_for_member_access = true
34+
35+
# Parentheses preferences
36+
dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity
37+
dotnet_style_parentheses_in_other_binary_operators = always_for_clarity
38+
dotnet_style_parentheses_in_other_operators = never_if_unnecessary
39+
dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity
40+
41+
# Modifier preferences
42+
dotnet_style_require_accessibility_modifiers = for_non_interface_members
43+
44+
# Expression-level preferences
45+
dotnet_style_coalesce_expression = true
46+
dotnet_style_collection_initializer = false
47+
dotnet_style_explicit_tuple_names = true
48+
dotnet_style_namespace_match_folder = true
49+
dotnet_style_null_propagation = true
50+
dotnet_style_object_initializer = true
51+
dotnet_style_operator_placement_when_wrapping = beginning_of_line
52+
dotnet_style_prefer_auto_properties = true
53+
dotnet_style_prefer_collection_expression = when_types_loosely_match
54+
dotnet_style_prefer_compound_assignment = true
55+
dotnet_style_prefer_conditional_expression_over_assignment = true
56+
dotnet_style_prefer_conditional_expression_over_return = true
57+
dotnet_style_prefer_foreach_explicit_cast_in_source = when_strongly_typed
58+
dotnet_style_prefer_inferred_anonymous_type_member_names = true
59+
dotnet_style_prefer_inferred_tuple_names = true
60+
dotnet_style_prefer_is_null_check_over_reference_equality_method = true
61+
dotnet_style_prefer_simplified_boolean_expressions = true
62+
dotnet_style_prefer_simplified_interpolation = true
63+
64+
# Field preferences
65+
dotnet_style_readonly_field = true
66+
67+
# Parameter preferences
68+
dotnet_code_quality_unused_parameters = all
69+
70+
# Suppression preferences
71+
dotnet_remove_unnecessary_suppression_exclusions = none
72+
73+
# New line preferences
74+
dotnet_style_allow_multiple_blank_lines_experimental = true
75+
dotnet_style_allow_statement_immediately_after_block_experimental = true
76+
77+
#### C# Coding Conventions ####
78+
79+
# var preferences
80+
csharp_style_var_elsewhere = false:suggestion
81+
csharp_style_var_for_built_in_types = false:suggestion
82+
csharp_style_var_when_type_is_apparent = false:suggestion
83+
84+
# Expression-bodied members
85+
csharp_style_expression_bodied_accessors = true
86+
csharp_style_expression_bodied_constructors = false
87+
csharp_style_expression_bodied_indexers = true
88+
csharp_style_expression_bodied_lambdas = true
89+
csharp_style_expression_bodied_local_functions = false
90+
csharp_style_expression_bodied_methods = false
91+
csharp_style_expression_bodied_operators = false
92+
csharp_style_expression_bodied_properties = true
93+
94+
# Pattern matching preferences
95+
csharp_style_pattern_matching_over_as_with_null_check = true
96+
csharp_style_pattern_matching_over_is_with_cast_check = true
97+
csharp_style_prefer_extended_property_pattern = true
98+
csharp_style_prefer_not_pattern = true
99+
csharp_style_prefer_pattern_matching = true
100+
csharp_style_prefer_switch_expression = true
101+
102+
# Null-checking preferences
103+
csharp_style_conditional_delegate_call = true
104+
105+
# Modifier preferences
106+
csharp_prefer_static_local_function = true
107+
csharp_preferred_modifier_order = public,private,protected,internal,file,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,required,volatile,async
108+
csharp_style_prefer_readonly_struct = true
109+
csharp_style_prefer_readonly_struct_member = true
110+
111+
# Code-block preferences
4112
csharp_prefer_braces = when_multiline
113+
csharp_prefer_simple_using_statement = true
114+
csharp_style_namespace_declarations = file_scoped
115+
csharp_style_prefer_method_group_conversion = true
116+
csharp_style_prefer_primary_constructors = true
117+
csharp_style_prefer_top_level_statements = true
118+
119+
# Expression-level preferences
120+
csharp_prefer_simple_default_expression = true
121+
csharp_style_deconstructed_variable_declaration = true
122+
csharp_style_implicit_object_creation_when_type_is_apparent = true
123+
csharp_style_inlined_variable_declaration = true
124+
csharp_style_prefer_index_operator = true
125+
csharp_style_prefer_local_over_anonymous_function = true
126+
csharp_style_prefer_null_check_over_type_check = true
127+
csharp_style_prefer_range_operator = true
128+
csharp_style_prefer_tuple_swap = true
129+
csharp_style_prefer_utf8_string_literals = true
130+
csharp_style_throw_expression = true
131+
csharp_style_unused_value_assignment_preference = discard_variable
132+
csharp_style_unused_value_expression_statement_preference = discard_variable
133+
134+
# 'using' directive preferences
135+
csharp_using_directive_placement = outside_namespace
136+
137+
# New line preferences
138+
csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = true
139+
csharp_style_allow_blank_line_after_token_in_arrow_expression_clause_experimental = true
140+
csharp_style_allow_blank_line_after_token_in_conditional_expression_experimental = true
141+
csharp_style_allow_blank_lines_between_consecutive_braces_experimental = true
142+
csharp_style_allow_embedded_statements_on_same_line_experimental = true
143+
144+
#### C# Formatting Rules ####
145+
146+
# New line preferences
147+
csharp_new_line_before_catch = true
148+
csharp_new_line_before_else = true
149+
csharp_new_line_before_finally = true
150+
csharp_new_line_before_members_in_anonymous_types = true
151+
csharp_new_line_before_members_in_object_initializers = true
152+
csharp_new_line_before_open_brace = all
153+
csharp_new_line_between_query_expression_clauses = true
154+
155+
# Indentation preferences
156+
csharp_indent_block_contents = true
157+
csharp_indent_braces = false
158+
csharp_indent_case_contents = true
159+
csharp_indent_case_contents_when_block = true
160+
csharp_indent_labels = one_less_than_current
161+
csharp_indent_switch_labels = true
162+
163+
# Space preferences
164+
csharp_space_after_cast = false
165+
csharp_space_after_colon_in_inheritance_clause = true
166+
csharp_space_after_comma = true
167+
csharp_space_after_dot = false
168+
csharp_space_after_keywords_in_control_flow_statements = true
169+
csharp_space_after_semicolon_in_for_statement = true
170+
csharp_space_around_binary_operators = before_and_after
171+
csharp_space_around_declaration_statements = false
172+
csharp_space_before_colon_in_inheritance_clause = true
173+
csharp_space_before_comma = false
174+
csharp_space_before_dot = false
175+
csharp_space_before_open_square_brackets = false
176+
csharp_space_before_semicolon_in_for_statement = false
177+
csharp_space_between_empty_square_brackets = false
178+
csharp_space_between_method_call_empty_parameter_list_parentheses = false
179+
csharp_space_between_method_call_name_and_opening_parenthesis = false
180+
csharp_space_between_method_call_parameter_list_parentheses = false
181+
csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
182+
csharp_space_between_method_declaration_name_and_open_parenthesis = false
183+
csharp_space_between_method_declaration_parameter_list_parentheses = false
184+
csharp_space_between_parentheses = false
185+
csharp_space_between_square_brackets = false
186+
187+
# Wrapping preferences
188+
csharp_preserve_single_line_blocks = true
189+
csharp_preserve_single_line_statements = true
190+
191+
#### Naming styles ####
192+
193+
# Naming rules
194+
195+
dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion
196+
dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface
197+
dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i
198+
199+
dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion
200+
dotnet_naming_rule.types_should_be_pascal_case.symbols = types
201+
dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case
202+
203+
dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion
204+
dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members
205+
dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case
206+
207+
# Symbol specifications
208+
209+
dotnet_naming_symbols.interface.applicable_kinds = interface
210+
dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
211+
dotnet_naming_symbols.interface.required_modifiers =
212+
213+
dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
214+
dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
215+
dotnet_naming_symbols.types.required_modifiers =
216+
217+
dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
218+
dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
219+
dotnet_naming_symbols.non_field_members.required_modifiers =
5220

6-
# IDE0045: Convert to conditional expression
7-
dotnet_style_prefer_conditional_expression_over_assignment = false
221+
# Naming styles
8222

9-
# Default severity for analyzer diagnostics with category 'Style'
10-
dotnet_analyzer_diagnostic.category-Style.severity = none
223+
dotnet_naming_style.pascal_case.required_prefix =
224+
dotnet_naming_style.pascal_case.required_suffix =
225+
dotnet_naming_style.pascal_case.word_separator =
226+
dotnet_naming_style.pascal_case.capitalization = pascal_case
11227

12-
dotnet_diagnostic.CA1416.severity = none
228+
dotnet_naming_style.begins_with_i.required_prefix = I
229+
dotnet_naming_style.begins_with_i.required_suffix =
230+
dotnet_naming_style.begins_with_i.word_separator =
231+
dotnet_naming_style.begins_with_i.capitalization = pascal_case

‎.github/workflows/buildDev.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
steps:
1414
- uses: actions/checkout@v4
1515
- name: Setup .NET
16-
uses: actions/setup-dotnet@v3
16+
uses: actions/setup-dotnet@v4
1717
with:
1818
dotnet-version: "8.0.x"
1919
- name: Install dependencies
@@ -27,7 +27,7 @@ jobs:
2727
run: dotnet publish ${{ env.PROJECT_PATH }} -c Release --self-contained -r win-x64 -p:PublishSingleFile=true -o publish
2828

2929
- name: Upload artifact
30-
uses: actions/upload-artifact@v3
30+
uses: actions/upload-artifact@v4
3131
with:
3232
name: Text-Grab
3333
path: .\publish

‎Tests/LanguageTests.cs

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
using System.Globalization;
2+
using Text_Grab.Models;
3+
4+
namespace Tests;
5+
public class LanguageTests
6+
{
7+
[Theory]
8+
[InlineData("zh-Hant")]
9+
[InlineData("zh-Hans")]
10+
public void CanParseEveryLanguageTag(string langTag)
11+
{
12+
CultureInfo culture = new(langTag);
13+
Assert.NotNull(culture);
14+
}
15+
16+
[Theory]
17+
[InlineData("chi_sim", "Chinese (Simplified)")]
18+
[InlineData("chi_tra", "Chinese (Traditional)")]
19+
[InlineData("chi_sim_vert", "Chinese (Simplified) Vertical")]
20+
[InlineData("chi_tra_vert", "Chinese (Traditional) Vertical")]
21+
public void CanParseChineseLanguageTag(string langTag, string expectedDisplayName)
22+
{
23+
TessLang tessLang = new(langTag);
24+
Assert.Equal(expectedDisplayName, tessLang.CultureDisplayName);
25+
}
26+
}

0 commit comments

Comments
 (0)