diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..a3c3072 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,219 @@ +# Удалите строку ниже, если вы хотите наследовать параметры .editorconfig из каталогов, расположенных выше в иерархии +root = true + +# Файлы C# +[*.cs] + +#### Основные параметры EditorConfig #### + +# Отступы и интервалы +indent_size = 4 +indent_style = space +tab_width = 4 + +# Предпочтения для новых строк +end_of_line = crlf +insert_final_newline = false + +#### Рекомендации по написанию кода .NET #### + +# Упорядочение Using +dotnet_separate_import_directive_groups = false +dotnet_sort_system_directives_first = true +file_header_template = unset + +# Предпочтения для this. и Me. +dotnet_style_qualification_for_event = false +dotnet_style_qualification_for_field = false +dotnet_style_qualification_for_method = false +dotnet_style_qualification_for_property = false + +# Параметры использования ключевых слов языка и типов BCL +dotnet_style_predefined_type_for_locals_parameters_members = true +dotnet_style_predefined_type_for_member_access = true + +# Предпочтения для скобок +dotnet_style_parentheses_in_arithmetic_binary_operators = never_if_unnecessary +dotnet_style_parentheses_in_other_binary_operators = always_for_clarity +dotnet_style_parentheses_in_other_operators = never_if_unnecessary +dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity + +# Предпочтения модификатора +dotnet_style_require_accessibility_modifiers = for_non_interface_members + +# Выражения уровень предпочтения +dotnet_style_coalesce_expression = true +dotnet_style_collection_initializer = true +dotnet_style_explicit_tuple_names = true +dotnet_style_namespace_match_folder = true +dotnet_style_null_propagation = true +dotnet_style_object_initializer = true +dotnet_style_operator_placement_when_wrapping = beginning_of_line +dotnet_style_prefer_auto_properties = true:suggestion +dotnet_style_prefer_compound_assignment = true +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 +dotnet_style_prefer_inferred_tuple_names = true +dotnet_style_prefer_is_null_check_over_reference_equality_method = true +dotnet_style_prefer_simplified_boolean_expressions = true +dotnet_style_prefer_simplified_interpolation = true + +# Предпочтения для полей +dotnet_style_readonly_field = false:silent + +# Настройки параметров +dotnet_code_quality_unused_parameters = non_public + +# Параметры подавления +dotnet_remove_unnecessary_suppression_exclusions = none + +# Предпочтения для новых строк +dotnet_style_allow_multiple_blank_lines_experimental = false +dotnet_style_allow_statement_immediately_after_block_experimental = true + +#### Рекомендации по написанию кода C# #### + +# Предпочтения var +csharp_style_var_elsewhere = false +csharp_style_var_for_built_in_types = false +csharp_style_var_when_type_is_apparent = true + +# Члены, заданные выражениями +csharp_style_expression_bodied_accessors = true:suggestion +csharp_style_expression_bodied_constructors = true:suggestion +csharp_style_expression_bodied_indexers = true:suggestion +csharp_style_expression_bodied_lambdas = true:suggestion +csharp_style_expression_bodied_local_functions = true:suggestion +csharp_style_expression_bodied_methods = true:suggestion +csharp_style_expression_bodied_operators = true:suggestion +csharp_style_expression_bodied_properties = true:suggestion + +# Настройки соответствия шаблонов +csharp_style_pattern_matching_over_as_with_null_check = true +csharp_style_pattern_matching_over_is_with_cast_check = true +csharp_style_prefer_not_pattern = true +csharp_style_prefer_pattern_matching = false +csharp_style_prefer_switch_expression = false + +# Настройки проверки на null +csharp_style_conditional_delegate_call = true + +# Предпочтения модификатора +csharp_prefer_static_local_function = false:silent +csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async + +# Предпочтения для блоков кода +csharp_prefer_braces = false:suggestion +csharp_prefer_simple_using_statement = true +csharp_style_namespace_declarations = file_scoped:suggestion + +# Выражения уровень предпочтения +csharp_prefer_simple_default_expression = true +csharp_style_deconstructed_variable_declaration = false +csharp_style_implicit_object_creation_when_type_is_apparent = true:silent +csharp_style_inlined_variable_declaration = true +csharp_style_pattern_local_over_anonymous_function = true +csharp_style_prefer_index_operator = false +csharp_style_prefer_null_check_over_type_check = true +csharp_style_prefer_range_operator = false +csharp_style_throw_expression = true +csharp_style_unused_value_assignment_preference = discard_variable:warning +csharp_style_unused_value_expression_statement_preference = unused_local_variable + +# предпочтения для директивы using +csharp_using_directive_placement = outside_namespace + +# Предпочтения для новых строк +csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = true +csharp_style_allow_blank_lines_between_consecutive_braces_experimental = false +csharp_style_allow_embedded_statements_on_same_line_experimental = true + +#### Правила форматирования 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 = true +csharp_indent_labels = one_less_than_current +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 = true + +#### Стили именования #### + +# Правила именования + +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, private_protected +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, private_protected +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, private_protected +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 diff --git a/Dtsod/DtsodV21.cs b/Dtsod/DtsodV21.cs index f855c76..f49b3a6 100644 --- a/Dtsod/DtsodV21.cs +++ b/Dtsod/DtsodV21.cs @@ -367,8 +367,8 @@ public class DtsodV21 : Dictionary, IDtsod } #if DEBUG - void Debug(params string[] msg) => PublicLog.Log(msg); - void DebugNoTime(params string[] msg) => PublicLog.LogNoTime(msg); + static void Debug(params string[] msg) => PublicLog.Log(msg); + static void DebugNoTime(params string[] msg) => PublicLog.LogNoTime(msg); #endif } diff --git a/Dtsod/DtsodV22.cs b/Dtsod/DtsodV22.cs index f9f71ca..65f39c2 100644 --- a/Dtsod/DtsodV22.cs +++ b/Dtsod/DtsodV22.cs @@ -489,7 +489,7 @@ public class DtsodV22 : Dictionary, IDtsod } #if DEBUG - void Debug(params string[] msg) => PublicLog.Log(msg); - void DebugNoTime(params string[] msg) => PublicLog.LogNoTime(msg); + static void Debug(params string[] msg) => PublicLog.Log(msg); + static void DebugNoTime(params string[] msg) => PublicLog.LogNoTime(msg); #endif } diff --git a/Dtsod/V30/DtsodDict.cs b/Dtsod/V30/DtsodDict.cs index edf727f..ca2e88a 100644 --- a/Dtsod/V30/DtsodDict.cs +++ b/Dtsod/V30/DtsodDict.cs @@ -1,6 +1,4 @@ -using System.Collections; - -namespace DTLib.Dtsod; +namespace DTLib.Dtsod; public class DtsodDict : IDictionary { @@ -33,7 +31,7 @@ public class DtsodDict : IDictionary } public virtual void Append(ICollection> anotherDtsod) { - foreach (var pair in anotherDtsod) + foreach (KeyValuePair pair in anotherDtsod) Add(pair.Key, pair.Value); } @@ -44,8 +42,8 @@ public class DtsodDict : IDictionary public int Count => baseDict.Count; - public ICollection Keys { get => baseDict.Keys; } - public ICollection Values { get => baseDict.Values; } + public ICollection Keys => baseDict.Keys; + public ICollection Values => baseDict.Values; public bool IsReadOnly { get; } = false; public virtual void Clear() => baseDict.Clear(); diff --git a/Dtsod/V30/DtsodV30.cs b/Dtsod/V30/DtsodV30.cs index ca3194e..c5e7181 100644 --- a/Dtsod/V30/DtsodV30.cs +++ b/Dtsod/V30/DtsodV30.cs @@ -11,7 +11,7 @@ public class DtsodV30 : DtsodDict, IDtsod public DtsodV30() : base() => UpdateLazy(); public DtsodV30(IDictionary dict) : base(dict) => UpdateLazy(); - public DtsodV30(string serialized) : this() { Append(Deserialize(serialized)); } + public DtsodV30(string serialized) : this() => Append(Deserialize(serialized)); #if DEBUG static void DebugLog(params string[] msg) => PublicLog.Log(msg); @@ -180,7 +180,7 @@ public class DtsodV30 : DtsodDict, IDtsod break; case ';': // один параметр case ',': // для листов - var str = b.ToString(); + string str = b.ToString(); b.Clear(); // hardcoded "null" value return str == "null" ? (new object[] { null }) : (new object[] { str }); @@ -220,7 +220,7 @@ public class DtsodV30 : DtsodDict, IDtsod object CreateInstance(Type type, object[] ctor_args) { - if (TypeHelper.BaseTypeConstructors.TryGetValue(type, out var ctor)) + if (TypeHelper.BaseTypeConstructors.TryGetValue(type, out Func ctor)) return (object)ctor.Invoke((string)ctor_args[0]); else if (type.CustomAttributes.Any(a => a.AttributeType == typeof(DtsodSerializableAttribute))) return Activator.CreateInstance(type, ctor_args); @@ -243,22 +243,14 @@ public class DtsodV30 : DtsodDict, IDtsod return output; } - public override void Append(ICollection> anotherDtsod) - { - base.Append(anotherDtsod); - //UpdateLazy(); - } + public override void Append(ICollection> anotherDtsod) => base.Append(anotherDtsod);//UpdateLazy(); - public override void Add(string key, dynamic value) - { - base.Add(key, (object)value); - //UpdateLazy(); - } + public override void Add(string key, dynamic value) => base.Add(key, (object)value);//UpdateLazy(); protected static string Serialize(IDictionary dtsod, ushort tabsCount = 0) { StringBuilder b = new(); - foreach (var pair in dtsod) + foreach (KeyValuePair pair in dtsod) { Type type = pair.Value.GetType(); b.Append(TypeHelper.TypeToString(type)).Append(':') diff --git a/Dtsod/V30/TypeHelper.cs b/Dtsod/V30/TypeHelper.cs index 0e671a5..88b1d7b 100644 --- a/Dtsod/V30/TypeHelper.cs +++ b/Dtsod/V30/TypeHelper.cs @@ -2,7 +2,7 @@ public static class TypeHelper { - static public readonly Dictionary> BaseTypeConstructors = new() + public static readonly Dictionary> BaseTypeConstructors = new() { { typeof(bool), (inp) => inp.ToBool() }, { typeof(char), (inp) => inp.ToChar() }, @@ -20,7 +20,7 @@ public static class TypeHelper { typeof(decimal), (inp) => inp.ToDecimal() } }; - static public Dictionary BaseTypeNames = new() + public static Dictionary BaseTypeNames = new() { { typeof(bool), "bool" }, { typeof(char), "char" }, @@ -38,12 +38,12 @@ public static class TypeHelper { typeof(decimal), "decimal" } }; - static public string TypeToString(Type t) => - BaseTypeNames.TryGetValue(t, out var name) + public static string TypeToString(Type t) => + BaseTypeNames.TryGetValue(t, out string name) ? name : t.AssemblyQualifiedName; - static public Type TypeFromString(string str) => str switch + public static Type TypeFromString(string str) => str switch { "bool" => typeof(bool), "char" => typeof(char), diff --git a/Extensions/BaseConverter.cs b/Extensions/BaseConverter.cs index 3f41947..e668068 100644 --- a/Extensions/BaseConverter.cs +++ b/Extensions/BaseConverter.cs @@ -1,10 +1,10 @@ -global using DTLib.Extensions; -global using DTLib.Filesystem; -global using System; +global using System; global using System.Collections; global using System.Collections.Generic; global using System.Text; global using System.Threading.Tasks; +global using DTLib.Extensions; +global using DTLib.Filesystem; global using static DTLib.PublicLog; namespace DTLib.Extensions; diff --git a/Extensions/StringConverter.cs b/Extensions/StringConverter.cs index fceaae0..dfa7028 100644 --- a/Extensions/StringConverter.cs +++ b/Extensions/StringConverter.cs @@ -110,11 +110,11 @@ public static class StringConverter public static List SplitToList(this string s, char c, char quot) { List output = new(); - var list = s.SplitToList(c); + List list = s.SplitToList(c); bool q_open = false; for (int i = 0; i < list.Count; i++) { - var _s = list[i]; + string _s = list[i]; if (q_open) { if (_s.EndsWith(quot)) @@ -147,7 +147,7 @@ public static class StringConverter public static string AddZeroes(this T number, int length) { - var str = number.ToString(); + string str = number.ToString(); return new string('0', str.Length - length) + str; } } diff --git a/Filesystem/Directory.cs b/Filesystem/Directory.cs index a180426..44a832b 100644 --- a/Filesystem/Directory.cs +++ b/Filesystem/Directory.cs @@ -128,7 +128,7 @@ public static class Directory // copies directory with symlinks instead of files public static int SymCopy(string srcdir, string newdir) { - var files = Directory.GetAllFiles(srcdir); + List files = Directory.GetAllFiles(srcdir); if (!srcdir.EndsWith('\\')) srcdir += '\\'; if (!newdir.EndsWith('\\')) newdir += '\\'; int i = 0; diff --git a/Filesystem/Symlink.cs b/Filesystem/Symlink.cs index 2e2b980..ad51ddb 100644 --- a/Filesystem/Symlink.cs +++ b/Filesystem/Symlink.cs @@ -5,7 +5,7 @@ namespace DTLib.Filesystem; internal class Symlink { [DllImport("kernel32.dll", CharSet = CharSet.Unicode)] - static internal extern bool CreateSymbolicLink(string symlinkName, string sourceName, SymlinkTarget type); + internal static extern bool CreateSymbolicLink(string symlinkName, string sourceName, SymlinkTarget type); internal enum SymlinkTarget { diff --git a/Loggers/BaseLogger.cs b/Loggers/BaseLogger.cs index cbbe437..3085e45 100644 --- a/Loggers/BaseLogger.cs +++ b/Loggers/BaseLogger.cs @@ -8,7 +8,7 @@ public abstract class BaseLogger public bool IsEnabled { get; private set; } = false; - readonly protected object statelocker = new(); + protected readonly object statelocker = new(); public void Disable() { lock (statelocker) IsEnabled = false; } public void Enable() { lock (statelocker) IsEnabled = true; } diff --git a/Network/FSP.cs b/Network/FSP.cs index ab16f65..0f66b00 100644 --- a/Network/FSP.cs +++ b/Network/FSP.cs @@ -1,5 +1,5 @@ -using DTLib.Dtsod; -using System.Net.Sockets; +using System.Net.Sockets; +using DTLib.Dtsod; namespace DTLib.Network;