Skip to content

Commit

Permalink
style: Update code style
Browse files Browse the repository at this point in the history
  • Loading branch information
@HMBSbige
HMBSbige committed Sep 8, 2021
1 parent 1be52fa commit 688fb6a
Show file tree
Hide file tree
Showing 24 changed files with 462 additions and 417 deletions.
301 changes: 114 additions & 187 deletions .editorconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,192 +28,119 @@ indent_size = 2
# 缩进和间距
indent_style = tab

#### .NET 编码约定 ####

# 组织 Using
dotnet_separate_import_directive_groups = false
dotnet_sort_system_directives_first = false
file_header_template = unset

# this. 和 Me. 首选项
dotnet_style_qualification_for_event = false:warning
dotnet_style_qualification_for_field = false:warning
dotnet_style_qualification_for_method = false:warning
dotnet_style_qualification_for_property = false:warning

# 语言关键字与 bcl 类型首选项
dotnet_style_predefined_type_for_locals_parameters_members = true:warning
dotnet_style_predefined_type_for_member_access = true:warning

# 括号首选项
dotnet_style_parentheses_in_arithmetic_binary_operators = never_if_unnecessary:silent
dotnet_style_parentheses_in_other_binary_operators = never_if_unnecessary:silent
dotnet_style_parentheses_in_other_operators = never_if_unnecessary:warning
dotnet_style_parentheses_in_relational_binary_operators = never_if_unnecessary:silent

# 修饰符首选项
dotnet_style_require_accessibility_modifiers = for_non_interface_members:warning

# 表达式级首选项
dotnet_style_coalesce_expression = true:warning
dotnet_style_collection_initializer = true:warning
dotnet_style_explicit_tuple_names = true:warning
dotnet_style_null_propagation = true:warning
dotnet_style_object_initializer = true:warning
dotnet_style_operator_placement_when_wrapping = beginning_of_line
dotnet_style_prefer_auto_properties = true:warning
dotnet_style_prefer_compound_assignment = true:warning
dotnet_style_prefer_conditional_expression_over_assignment = true:silent
dotnet_style_prefer_conditional_expression_over_return = true:silent
dotnet_style_prefer_inferred_anonymous_type_member_names = true:silent
dotnet_style_prefer_inferred_tuple_names = true:silent
dotnet_style_prefer_is_null_check_over_reference_equality_method = true:warning
dotnet_style_prefer_simplified_boolean_expressions = true:warning
dotnet_style_prefer_simplified_interpolation = true:suggestion

# 字段首选项
dotnet_style_readonly_field = true:suggestion

# 参数首选项
dotnet_code_quality_unused_parameters = all:warning

# 禁止显示首选项
dotnet_remove_unnecessary_suppression_exclusions = none

#### c# 编码约定 ####

# var 首选项
csharp_style_var_elsewhere = true:silent
# Microsoft .NET properties
csharp_new_line_before_members_in_object_initializers = false
csharp_preferred_modifier_order = public, private, protected, internal, new, abstract, virtual, sealed, override, static, readonly, extern, unsafe, volatile, async:suggestion
csharp_style_expression_bodied_accessors = true:suggestion
csharp_style_expression_bodied_constructors = false:suggestion
csharp_style_expression_bodied_methods = false:warning
csharp_style_expression_bodied_properties = true:suggestion
csharp_style_var_elsewhere = true:warning
csharp_style_var_for_built_in_types = true:warning
csharp_style_var_when_type_is_apparent = true:warning

# Expression-bodied 成员
csharp_style_expression_bodied_accessors = when_on_single_line:warning
csharp_style_expression_bodied_constructors = false:suggestion
csharp_style_expression_bodied_indexers = when_on_single_line:warning
csharp_style_expression_bodied_lambdas = when_on_single_line:suggestion
csharp_style_expression_bodied_local_functions = false:suggestion
csharp_style_expression_bodied_methods = false:suggestion
csharp_style_expression_bodied_operators = false:suggestion
csharp_style_expression_bodied_properties = when_on_single_line:warning

# 模式匹配首选项
csharp_style_pattern_matching_over_as_with_null_check = true:warning
csharp_style_pattern_matching_over_is_with_cast_check = true:warning
csharp_style_prefer_not_pattern = true:warning
csharp_style_prefer_pattern_matching = true:warning
csharp_style_prefer_switch_expression = true:warning

# Null 检查首选项
csharp_style_conditional_delegate_call = true:warning

# 修饰符首选项
csharp_prefer_static_local_function = true:suggestion
csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:suggestion

# 代码块首选项
csharp_prefer_braces = true:warning
csharp_prefer_simple_using_statement = true:suggestion

# 表达式级首选项
csharp_prefer_simple_default_expression = true:warning
csharp_style_deconstructed_variable_declaration = true:suggestion
csharp_style_inlined_variable_declaration = true:warning
csharp_style_pattern_local_over_anonymous_function = true:suggestion
csharp_style_prefer_index_operator = true:warning
csharp_style_prefer_range_operator = true:suggestion
csharp_style_throw_expression = true:suggestion
csharp_style_unused_value_assignment_preference = discard_variable:silent
csharp_style_unused_value_expression_statement_preference = discard_variable:none

# "using" 指令首选项
csharp_using_directive_placement = outside_namespace:warning

#### C# 格式规则 ####

# 新行首选项
csharp_new_line_before_catch = true
csharp_new_line_before_else = true
csharp_new_line_before_finally = true
csharp_new_line_before_members_in_anonymous_types = true
csharp_new_line_before_members_in_object_initializers = true
csharp_new_line_before_open_brace = all
csharp_new_line_between_query_expression_clauses = true

# 缩进首选项
csharp_indent_block_contents = true
csharp_indent_braces = false
csharp_indent_case_contents = true
csharp_indent_case_contents_when_block = false
csharp_indent_labels = flush_left
csharp_indent_switch_labels = true

# 空格键首选项
csharp_space_after_cast = false
csharp_space_after_colon_in_inheritance_clause = true
csharp_space_after_comma = true
csharp_space_after_dot = false
csharp_space_after_keywords_in_control_flow_statements = true
csharp_space_after_semicolon_in_for_statement = true
csharp_space_around_binary_operators = before_and_after
csharp_space_around_declaration_statements = false
csharp_space_before_colon_in_inheritance_clause = true
csharp_space_before_comma = false
csharp_space_before_dot = false
csharp_space_before_open_square_brackets = false
csharp_space_before_semicolon_in_for_statement = false
csharp_space_between_empty_square_brackets = false
csharp_space_between_method_call_empty_parameter_list_parentheses = false
csharp_space_between_method_call_name_and_opening_parenthesis = false
csharp_space_between_method_call_parameter_list_parentheses = false
csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
csharp_space_between_method_declaration_name_and_open_parenthesis = false
csharp_space_between_method_declaration_parameter_list_parentheses = false
csharp_space_between_parentheses = false
csharp_space_between_square_brackets = false

# 包装首选项
csharp_preserve_single_line_blocks = true
csharp_preserve_single_line_statements = false

#### 命名样式 ####

# 命名规则

dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion
dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface
dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i

dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion
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 = suggestion
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

# 符号规范

dotnet_naming_symbols.interface.applicable_kinds = interface
dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal
dotnet_naming_symbols.interface.required_modifiers =

dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal
dotnet_naming_symbols.types.required_modifiers =

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
dotnet_naming_symbols.non_field_members.required_modifiers =

# 命名样式

dotnet_naming_style.pascal_case.required_prefix =
dotnet_naming_style.pascal_case.required_suffix =
dotnet_naming_style.pascal_case.word_separator =
dotnet_naming_style.pascal_case.capitalization = pascal_case

dotnet_naming_style.begins_with_i.required_prefix = I
dotnet_naming_style.begins_with_i.required_suffix =
dotnet_naming_style.begins_with_i.word_separator =
dotnet_naming_style.begins_with_i.capitalization = pascal_case
dotnet_sort_system_directives_first = false
dotnet_style_parentheses_in_arithmetic_binary_operators = never_if_unnecessary:none
dotnet_style_parentheses_in_other_binary_operators = never_if_unnecessary: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 properties
resharper_align_multiline_binary_expressions_chain = false
resharper_autodetect_indent_settings = true
resharper_blank_lines_after_block_statements = 0
resharper_braces_for_for = required
resharper_braces_for_foreach = required
resharper_braces_for_ifelse = required
resharper_braces_for_while = required
resharper_braces_redundant = false
resharper_csharp_alignment_tab_fill_style = optimal_fill
resharper_csharp_blank_lines_around_invocable = 0
resharper_csharp_indent_style = tab
resharper_csharp_insert_final_newline = true
resharper_csharp_int_align_comments = true
resharper_csharp_keep_blank_lines_in_code = 1
resharper_csharp_keep_blank_lines_in_declarations = 1
resharper_csharp_max_line_length = 443
resharper_csharp_stick_comment = false
resharper_csharp_wrap_after_declaration_lpar = true
resharper_csharp_wrap_after_invocation_lpar = true
resharper_csharp_wrap_arguments_style = chop_if_long
resharper_csharp_wrap_before_binary_opsign = true
resharper_csharp_wrap_before_first_type_parameter_constraint = true
resharper_csharp_wrap_before_invocation_rpar = true
resharper_csharp_wrap_lines = false
resharper_csharp_wrap_multiple_type_parameter_constraints_style = chop_always
resharper_int_align_switch_expressions = true
resharper_int_align_switch_sections = true
resharper_keep_existing_declaration_block_arrangement = true
resharper_keep_existing_declaration_parens_arrangement = false
resharper_keep_existing_embedded_arrangement = false
resharper_keep_existing_expr_member_arrangement = false
resharper_keep_existing_invocation_parens_arrangement = false
resharper_keep_existing_property_patterns_arrangement = false
resharper_keep_existing_switch_expression_arrangement = false
resharper_max_array_initializer_elements_on_line = 8
resharper_max_enum_members_on_line = 1
resharper_max_initializer_elements_on_line = 1
resharper_max_invocation_arguments_on_line = 4
resharper_nested_ternary_style = expanded
resharper_outdent_statement_labels = true
resharper_place_attribute_on_same_line = false
resharper_place_linq_into_on_new_line = false
resharper_place_simple_accessor_on_single_line = false
resharper_place_simple_anonymousmethod_on_single_line = false
resharper_place_simple_embedded_statement_on_same_line = false
resharper_place_simple_initializer_on_single_line = false
resharper_remove_blank_lines_near_braces_in_code = false
resharper_show_autodetect_configure_formatting_tip = false
resharper_use_continuous_indent_inside_initializer_braces = false
resharper_use_indent_from_vs = false
resharper_wrap_before_linq_expression = true
resharper_wrap_before_type_parameter_langle = true
resharper_wrap_chained_binary_expressions = chop_if_long
resharper_wrap_chained_method_calls = chop_if_long
resharper_wrap_linq_expressions = chop_always
resharper_wrap_object_and_collection_initializer_style = chop_always
resharper_xmldoc_indent_size = 2
resharper_xmldoc_max_line_length = 1
resharper_xmldoc_space_after_last_pi_attribute = true
resharper_xmldoc_tab_width = 2
resharper_xml_indent_size = 2
resharper_xml_tab_width = 2

# ReSharper inspection severities
resharper_arrange_constructor_or_destructor_body_highlighting = hint
resharper_arrange_local_function_body_highlighting = hint
resharper_arrange_modifiers_order_highlighting = hint
resharper_arrange_object_creation_when_type_evident_highlighting = warning
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_empty_constructor_highlighting = suggestion
resharper_inconsistent_naming_highlighting = hint
resharper_inline_out_variable_declaration_highlighting = warning
resharper_merge_cast_with_type_check_highlighting = warning
resharper_method_supports_cancellation_highlighting = warning
resharper_parameter_only_used_for_precondition_check_local_highlighting = suggestion
resharper_redundant_argument_default_value_highlighting = suggestion
resharper_redundant_base_qualifier_highlighting = warning
resharper_redundant_default_member_initializer_highlighting = suggestion
resharper_shift_expression_result_equals_zero_highlighting = hint
resharper_unused_auto_property_accessor_global_highlighting = hint
resharper_unused_member_global_highlighting = hint
resharper_unused_method_return_value_global_highlighting = hint
resharper_unused_method_return_value_local_highlighting = suggestion
resharper_unused_parameter_local_highlighting = suggestion
resharper_web_config_module_not_resolved_highlighting = warning
resharper_web_config_type_not_resolved_highlighting = warning
resharper_web_config_wrong_module_highlighting = warning
resharper_xaml_binding_with_context_not_resolved_highlighting = suggestion
4 changes: 4 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -360,3 +360,7 @@ MigrationBackup/

# Fody - auto-generated XML schema
FodyWeavers.xsd

# JetBrains Rider
.idea/
*.sln.iml
44 changes: 24 additions & 20 deletions Benchmark/PipelinesBenchmark.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,20 @@ public void Cleanup()
[Benchmark(Baseline = true)]
public async Task StreamAsync()
{
var t = Task.Run(async () =>
{
using var tcpClient = await _server.AcceptTcpClientAsync();
var reader = tcpClient.GetStream().AsPipeReader();
var read = 0L;
while (read < Length)
var t = Task.Run(
async () =>
{
var result = await reader.ReadAsync();
read += result.Buffer.Length;
reader.AdvanceTo(result.Buffer.End);
using var tcpClient = await _server.AcceptTcpClientAsync();
var reader = tcpClient.GetStream().AsPipeReader();
var read = 0L;
while (read < Length)
{
var result = await reader.ReadAsync();
read += result.Buffer.Length;
reader.AdvanceTo(result.Buffer.End);
}
}
});
);

using var client = new TcpClient();
await client.ConnectAsync(IPAddress.Loopback, _serverPort);
Expand All @@ -63,18 +65,20 @@ public async Task StreamAsync()
[Benchmark]
public async Task SocketAsync()
{
var t = Task.Run(async () =>
{
using var socket = await _server.AcceptSocketAsync();
var reader = socket.AsPipeReader();
var read = 0L;
while (read < Length)
var t = Task.Run(
async () =>
{
var result = await reader.ReadAsync();
read += result.Buffer.Length;
reader.AdvanceTo(result.Buffer.End);
using var socket = await _server.AcceptSocketAsync();
var reader = socket.AsPipeReader();
var read = 0L;
while (read < Length)
{
var result = await reader.ReadAsync();
read += result.Buffer.Length;
reader.AdvanceTo(result.Buffer.End);
}
}
});
);

using var client = new TcpClient();
await client.ConnectAsync(IPAddress.Loopback, _serverPort);
Expand Down
2 changes: 1 addition & 1 deletion HttpProxy/HttpToSocks5.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ private static bool TryParseHeader(string raw, [NotNullWhen(true)] out HttpHeade
#endregion

return true;
InvalidRequest:
InvalidRequest:
httpHeaders = null;
return false;
}
Expand Down
Loading

0 comments on commit 688fb6a

Please sign in to comment.