Skip to content

Commit d40052c

Browse files
stratosbluestratosblue
committed
editorconfig; code format(again)
1 parent 139fbd3 commit d40052c

Some content is hidden

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

45 files changed

+198
-69
lines changed

‎.editorconfig‎

Lines changed: 45 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,34 @@
1-
# 如果要从更高级别的目录继承 .editorconfig 设置，请删除以下行
1+
# 如果要从更高级别的目录继承 .editorconfig 设置，请删除以下行
22
root = true
33

4+
[*]
5+
charset = utf-8-bom
6+
end_of_line = crlf
7+
indent_style = space
8+
insert_final_newline = true
9+
trim_trailing_whitespace = true
10+
dotnet_style_qualification_for_field = false:silent
11+
dotnet_style_qualification_for_property = false:silent
12+
dotnet_style_qualification_for_method = false:silent
13+
dotnet_style_qualification_for_event = false:silent
14+
dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
15+
indent_size = 4
16+
tab_width = 4
17+
dotnet_style_operator_placement_when_wrapping = beginning_of_line
18+
419
# c# 文件
520
[*.cs]
621

722
#### Core EditorConfig 选项 ####
823

924
# 缩进和间距
1025
indent_size = 4
11-
indent_style = space
1226
tab_width = 4
1327

14-
# 新行首选项
15-
end_of_line = crlf
16-
insert_final_newline = false
17-
1828
#### .NET 编码约定 ####
1929

2030
# 组织 Using
21-
dotnet_separate_import_directive_groups = true
31+
dotnet_separate_import_directive_groups = false
2232
dotnet_sort_system_directives_first = true
2333
file_header_template = unset
2434

@@ -76,19 +86,19 @@ dotnet_style_allow_statement_immediately_after_block_experimental = true
7686
#### c# 编码约定 ####
7787

7888
# var 首选项
79-
csharp_style_var_elsewhere = false
80-
csharp_style_var_for_built_in_types = false
81-
csharp_style_var_when_type_is_apparent = false
89+
csharp_style_var_elsewhere = false:silent
90+
csharp_style_var_for_built_in_types = false:silent
91+
csharp_style_var_when_type_is_apparent = false:silent
8292

8393
# Expression-bodied 成员
84-
csharp_style_expression_bodied_accessors = true
85-
csharp_style_expression_bodied_constructors = false
86-
csharp_style_expression_bodied_indexers = true
87-
csharp_style_expression_bodied_lambdas = true
88-
csharp_style_expression_bodied_local_functions = false
89-
csharp_style_expression_bodied_methods = false
90-
csharp_style_expression_bodied_operators = false
91-
csharp_style_expression_bodied_properties = true
94+
csharp_style_expression_bodied_accessors = true:silent
95+
csharp_style_expression_bodied_constructors = false:silent
96+
csharp_style_expression_bodied_indexers = true:silent
97+
csharp_style_expression_bodied_lambdas = true:silent
98+
csharp_style_expression_bodied_local_functions = false:silent
99+
csharp_style_expression_bodied_methods = false:silent
100+
csharp_style_expression_bodied_operators = false:silent
101+
csharp_style_expression_bodied_properties = true:silent
92102

93103
# 模式匹配首选项
94104
csharp_style_pattern_matching_over_as_with_null_check = true
@@ -99,18 +109,19 @@ csharp_style_prefer_pattern_matching = true
99109
csharp_style_prefer_switch_expression = true
100110

101111
# Null 检查首选项
102-
csharp_style_conditional_delegate_call = true
112+
csharp_style_conditional_delegate_call = true:suggestion
103113

104114
# 修饰符首选项
105-
csharp_prefer_static_local_function = true
115+
csharp_prefer_static_local_function = true:suggestion
106116
csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async
117+
csharp_style_prefer_readonly_struct = true
107118

108119
# 代码块首选项
109-
csharp_prefer_braces = true
110-
csharp_prefer_simple_using_statement = true
111-
csharp_style_namespace_declarations = file_scoped
112-
csharp_style_prefer_method_group_conversion = true
113-
csharp_style_prefer_top_level_statements = true
120+
csharp_prefer_braces = true:silent
121+
csharp_prefer_simple_using_statement = true:suggestion
122+
csharp_style_namespace_declarations = file_scoped:suggestion
123+
csharp_style_prefer_method_group_conversion = true:silent
124+
csharp_style_prefer_top_level_statements = true:silent
114125

115126
# 表达式级首选项
116127
csharp_prefer_simple_default_expression = true
@@ -128,7 +139,7 @@ csharp_style_unused_value_assignment_preference = discard_variable
128139
csharp_style_unused_value_expression_statement_preference = discard_variable
129140

130141
# "using" 指令首选项
131-
csharp_using_directive_placement = outside_namespace
142+
csharp_using_directive_placement = outside_namespace:silent
132143

133144
# 新行首选项
134145
csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = true
@@ -289,3 +300,11 @@ dotnet_naming_style.以_为前缀.required_prefix = _
289300
dotnet_naming_style.以_为前缀.required_suffix =
290301
dotnet_naming_style.以_为前缀.word_separator =
291302
dotnet_naming_style.以_为前缀.capitalization = camel_case
303+
304+
[*.csproj]
305+
indent_size = 2
306+
tab_width = 2
307+
308+
[*.props]
309+
indent_size = 2
310+
tab_width = 2

‎CodeMaid.config‎

Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<configSections>
4+
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
5+
<section name="SteveCadwallader.CodeMaid.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
6+
</sectionGroup>
7+
</configSections>
8+
<userSettings>
9+
<SteveCadwallader.CodeMaid.Properties.Settings>
10+
<setting name="Reorganizing_MemberTypeFields" serializeAs="String">
11+
<value>Fields||3||字段</value>
12+
</setting>
13+
<setting name="Reorganizing_MemberTypeProperties" serializeAs="String">
14+
<value>Properties||4||属性</value>
15+
</setting>
16+
<setting name="Reorganizing_MemberTypeMethods" serializeAs="String">
17+
<value>Methods||9||方法</value>
18+
</setting>
19+
<setting name="Reorganizing_MemberTypeDelegates" serializeAs="String">
20+
<value>Delegates||1||委托</value>
21+
</setting>
22+
<setting name="Reorganizing_MemberTypeEvents" serializeAs="String">
23+
<value>Events||2||事件</value>
24+
</setting>
25+
<setting name="Reorganizing_MemberTypeInterfaces" serializeAs="String">
26+
<value>Interfaces||8||接口</value>
27+
</setting>
28+
<setting name="Reorganizing_MemberTypeConstructors" serializeAs="String">
29+
<value>Constructors||6||构造函数</value>
30+
</setting>
31+
<setting name="Reorganizing_MemberTypeEnums" serializeAs="String">
32+
<value>Enums||10||枚举</value>
33+
</setting>
34+
<setting name="Reorganizing_MemberTypeDestructors" serializeAs="String">
35+
<value>Destructors||7||析构函数</value>
36+
</setting>
37+
<setting name="Reorganizing_MemberTypeIndexers" serializeAs="String">
38+
<value>Indexers||5||索引器</value>
39+
</setting>
40+
<setting name="Reorganizing_MemberTypeClasses" serializeAs="String">
41+
<value>Classes||12||类</value>
42+
</setting>
43+
<setting name="Reorganizing_MemberTypeStructs" serializeAs="String">
44+
<value>Structs||11||结构体</value>
45+
</setting>
46+
<setting name="Reorganizing_RegionsInsertNewRegions" serializeAs="String">
47+
<value>True</value>
48+
</setting>
49+
<setting name="Reorganizing_RunAtStartOfCleanup" serializeAs="String">
50+
<value>True</value>
51+
</setting>
52+
<setting name="Reorganizing_RegionsRemoveExistingRegions" serializeAs="String">
53+
<value>False</value>
54+
</setting>
55+
<setting name="Digging_PrimarySortOrder" serializeAs="String">
56+
<value>0</value>
57+
</setting>
58+
<setting name="Reorganizing_RegionsIncludeAccessLevel" serializeAs="String">
59+
<value>True</value>
60+
</setting>
61+
<setting name="General_Font" serializeAs="String">
62+
<value>Consolas</value>
63+
</setting>
64+
<setting name="Reorganizing_ReverseOrderByAccessLevel" serializeAs="String">
65+
<value>False</value>
66+
</setting>
67+
<setting name="Reorganizing_ExplicitMembersAtEnd" serializeAs="String">
68+
<value>True</value>
69+
</setting>
70+
<setting name="General_Theme" serializeAs="String">
71+
<value>1</value>
72+
</setting>
73+
<setting name="Cleaning_AutoSaveAndCloseIfOpenedByCleanup" serializeAs="String">
74+
<value>False</value>
75+
</setting>
76+
<setting name="Collapsing_CollapseSolutionWhenOpened" serializeAs="String">
77+
<value>False</value>
78+
</setting>
79+
<setting name="Collapsing_KeepSoloProjectExpanded" serializeAs="String">
80+
<value>False</value>
81+
</setting>
82+
<setting name="Cleaning_RemoveEndOfFileTrailingNewLine" serializeAs="String">
83+
<value>False</value>
84+
</setting>
85+
<setting name="Cleaning_InsertEndOfFileTrailingNewLine" serializeAs="String">
86+
<value>True</value>
87+
</setting>
88+
<setting name="Cleaning_InsertBlankLinePaddingBeforePropertiesSingleLine"
89+
serializeAs="String">
90+
<value>True</value>
91+
</setting>
92+
<setting name="Cleaning_InsertBlankLinePaddingBeforeFieldsSingleLine"
93+
serializeAs="String">
94+
<value>True</value>
95+
</setting>
96+
<setting name="Feature_SettingCleanupOnSave" serializeAs="String">
97+
<value>True</value>
98+
</setting>
99+
<setting name="Finding_TemporarilyOpenSolutionFolders" serializeAs="String">
100+
<value>False</value>
101+
</setting>
102+
<setting name="Progressing_HideBuildProgressOnBuildStop" serializeAs="String">
103+
<value>True</value>
104+
</setting>
105+
<setting name="Feature_FindInSolutionExplorer" serializeAs="String">
106+
<value>False</value>
107+
</setting>
108+
</SteveCadwallader.CodeMaid.Properties.Settings>
109+
</userSettings>
110+
</configuration>

‎src/ObjectBoolean.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ private ObjectBoolean(bool value)
2828
public static implicit operator ObjectBoolean(bool value) => value ? True : False;
2929

3030
#endregion Public 方法
31-
}
31+
}

‎src/Options/DictionaryCombinationCreateForm.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,4 +70,4 @@ private void ListBoxUnselected_SelectedValueChanged(object sender, EventArgs e)
7070
{
7171
buttonSelect.Enabled = listBoxUnselected.SelectedItem is not null;
7272
}
73-
}
73+
}

‎src/Options/Model/DictionaryManageOptions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,4 +121,4 @@ public bool Equals(DictionaryDescriptor other)
121121
public override int GetHashCode() => FilePath.GetHashCode();
122122

123123
public override string ToString() => $"{Name}[{FilePath}]";
124-
}
124+
}

‎src/Options/Model/GeneralOptions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,4 +145,4 @@ private string[] ChangeExcludeExtensions(string value)
145145
}
146146

147147
#endregion Private 方法
148-
}
148+
}

‎src/Options/Model/Options.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,4 +187,4 @@ private IEnumerable<PropertyInfo> GetOptionProperties()
187187
return GetType().GetProperties()
188188
.Where(p => p.PropertyType.IsSerializable && p.PropertyType.IsPublic);
189189
}
190-
}
190+
}

‎src/Options/Model/PreMatchType.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ public enum PreMatchType
2121
/// 全字符匹配
2222
/// </summary>
2323
FullText,
24-
}
24+
}

‎src/Options/Model/StringPreCheckRule.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ public enum StringPreCheckRule
2121
/// 自定义
2222
/// </summary>
2323
//Custom
24-
}
24+
}

‎src/Options/OptionPage.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ public override void SaveSettingsToStorage()
2727
{
2828
Options.Save();
2929
}
30-
}
30+
}

0 commit comments

Comments
 (0)