refactor: clean up unused name formatting
This commit is contained in:
parent
5579f0dc3d
commit
452cbeb227
203
.editorconfig
203
.editorconfig
|
@ -1,203 +0,0 @@
|
|||
# Remove the line below if you want to inherit .editorconfig settings from higher directories
|
||||
root = true
|
||||
|
||||
# C# files
|
||||
[*.{cs,json}]
|
||||
|
||||
#### Core EditorConfig Options ####
|
||||
|
||||
# Indentation and spacing
|
||||
indent_size = 4
|
||||
indent_style = space
|
||||
tab_width = 4
|
||||
|
||||
# New line preferences
|
||||
end_of_line = lf
|
||||
insert_final_newline = true
|
||||
|
||||
[*.cs]
|
||||
|
||||
#### .NET Coding Conventions ####
|
||||
|
||||
# Organize usings
|
||||
dotnet_separate_import_directive_groups = false
|
||||
dotnet_sort_system_directives_first = false
|
||||
file_header_template = unset
|
||||
|
||||
# this. and Me. preferences
|
||||
dotnet_style_qualification_for_event = true:error
|
||||
dotnet_style_qualification_for_field = true:error
|
||||
dotnet_style_qualification_for_method = true:error
|
||||
dotnet_style_qualification_for_property = true:error
|
||||
|
||||
# Language keywords vs BCL types preferences
|
||||
dotnet_style_predefined_type_for_locals_parameters_members = true:silent
|
||||
dotnet_style_predefined_type_for_member_access = true:silent
|
||||
|
||||
# Parentheses preferences
|
||||
dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent
|
||||
dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent
|
||||
dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent
|
||||
dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent
|
||||
|
||||
# Modifier preferences
|
||||
dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
|
||||
|
||||
# Expression-level preferences
|
||||
dotnet_style_coalesce_expression = true:suggestion
|
||||
dotnet_style_collection_initializer = true:suggestion
|
||||
dotnet_style_explicit_tuple_names = true:suggestion
|
||||
dotnet_style_null_propagation = true:suggestion
|
||||
dotnet_style_object_initializer = true:suggestion
|
||||
dotnet_style_operator_placement_when_wrapping = beginning_of_line
|
||||
dotnet_style_prefer_auto_properties = true:silent
|
||||
dotnet_style_prefer_compound_assignment = true:suggestion
|
||||
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:suggestion
|
||||
dotnet_style_prefer_inferred_tuple_names = true:suggestion
|
||||
dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion
|
||||
dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
|
||||
dotnet_style_prefer_simplified_interpolation = true:suggestion
|
||||
|
||||
# Field preferences
|
||||
dotnet_style_readonly_field = true:suggestion
|
||||
|
||||
# Parameter preferences
|
||||
dotnet_code_quality_unused_parameters = all:suggestion
|
||||
|
||||
#### C# Coding Conventions ####
|
||||
|
||||
# var preferences
|
||||
csharp_style_var_elsewhere = false:silent
|
||||
csharp_style_var_for_built_in_types = false:silent
|
||||
csharp_style_var_when_type_is_apparent = false:silent
|
||||
|
||||
# Expression-bodied members
|
||||
csharp_style_expression_bodied_accessors = true:silent
|
||||
csharp_style_expression_bodied_constructors = false:silent
|
||||
csharp_style_expression_bodied_indexers = true:silent
|
||||
csharp_style_expression_bodied_lambdas = true:silent
|
||||
csharp_style_expression_bodied_local_functions = false:silent
|
||||
csharp_style_expression_bodied_methods = false:silent
|
||||
csharp_style_expression_bodied_operators = false:silent
|
||||
csharp_style_expression_bodied_properties = true:silent
|
||||
|
||||
# Pattern matching preferences
|
||||
csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
|
||||
csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
|
||||
csharp_style_prefer_switch_expression = true:suggestion
|
||||
|
||||
# Null-checking preferences
|
||||
csharp_style_conditional_delegate_call = true:suggestion
|
||||
|
||||
# Modifier preferences
|
||||
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:silent
|
||||
|
||||
# Code-block preferences
|
||||
csharp_prefer_braces = true:error
|
||||
csharp_prefer_simple_using_statement = true:suggestion
|
||||
|
||||
# Expression-level preferences
|
||||
csharp_prefer_simple_default_expression = true:suggestion
|
||||
csharp_style_deconstructed_variable_declaration = true:suggestion
|
||||
csharp_style_inlined_variable_declaration = true:suggestion
|
||||
csharp_style_pattern_local_over_anonymous_function = true:suggestion
|
||||
csharp_style_prefer_index_operator = true:suggestion
|
||||
csharp_style_prefer_range_operator = true:suggestion
|
||||
csharp_style_throw_expression = true:suggestion
|
||||
csharp_style_unused_value_assignment_preference = discard_variable:suggestion
|
||||
csharp_style_unused_value_expression_statement_preference = discard_variable:silent
|
||||
|
||||
# 'using' directive preferences
|
||||
csharp_using_directive_placement = outside_namespace:silent
|
||||
|
||||
#### C# Formatting Rules ####
|
||||
|
||||
# New line preferences
|
||||
csharp_new_line_before_catch = false
|
||||
csharp_new_line_before_else = false
|
||||
csharp_new_line_before_finally = false
|
||||
csharp_new_line_before_members_in_anonymous_types = true
|
||||
csharp_new_line_before_members_in_object_initializers = true
|
||||
csharp_new_line_before_open_brace = none
|
||||
csharp_new_line_between_query_expression_clauses = true
|
||||
|
||||
# Indentation preferences
|
||||
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
|
||||
|
||||
# Space preferences
|
||||
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
|
||||
|
||||
# Wrapping preferences
|
||||
csharp_preserve_single_line_blocks = true
|
||||
csharp_preserve_single_line_statements = true
|
||||
|
||||
#### Naming styles ####
|
||||
|
||||
# Naming rules
|
||||
|
||||
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
|
||||
|
||||
# Symbol specifications
|
||||
|
||||
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 =
|
||||
|
||||
# Naming styles
|
||||
|
||||
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
|
|
@ -6,9 +6,6 @@ MinimumVisualStudioVersion = 10.0.40219.1
|
|||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XIVChatPlugin", "XIVChatPlugin\XIVChatPlugin.csproj", "{9AEB2B77-C127-4BA8-B9AE-FB3CA1649FDB}"
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{9F0334E6-42D0-4CCE-888B-64DBE39D8407}"
|
||||
ProjectSection(SolutionItems) = preProject
|
||||
.editorconfig = .editorconfig
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XIVChatCommon", "XIVChatCommon\XIVChatCommon.csproj", "{6F426EAB-15D4-48AC-80D2-2D2DF2CE5EE0}"
|
||||
EndProject
|
||||
|
|
|
@ -45,44 +45,18 @@ namespace XIVChatCommon.Message {
|
|||
public byte index;
|
||||
}
|
||||
|
||||
public class NameFormatting {
|
||||
public string Before { get; private set; } = string.Empty;
|
||||
public string After { get; private set; } = string.Empty;
|
||||
public bool IsPresent { get; private set; } = true;
|
||||
|
||||
public static NameFormatting Empty() {
|
||||
return new NameFormatting {
|
||||
IsPresent = false,
|
||||
};
|
||||
}
|
||||
|
||||
public static NameFormatting Of(string before, string after) {
|
||||
return new NameFormatting {
|
||||
Before = before,
|
||||
After = after,
|
||||
};
|
||||
}
|
||||
|
||||
public static NameFormatting Basic() {
|
||||
return new NameFormatting {
|
||||
Before = "",
|
||||
After = ": ",
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
public class ChatCode {
|
||||
private const ushort Clear7 = ~(~0 << 7);
|
||||
|
||||
private readonly ushort code;
|
||||
public ushort Raw { get; }
|
||||
|
||||
public ChatType Type => (ChatType)(this.code & Clear7);
|
||||
public ChatType Type => (ChatType)(this.Raw & Clear7);
|
||||
public ChatSource Source => this.SourceFrom(11);
|
||||
public ChatSource Target => this.SourceFrom(7);
|
||||
private ChatSource SourceFrom(ushort shift) => (ChatSource)(1 << ((this.code >> shift) & 0xF));
|
||||
private ChatSource SourceFrom(ushort shift) => (ChatSource)(1 << ((this.Raw >> shift) & 0xF));
|
||||
|
||||
public ChatCode(ushort code) {
|
||||
this.code = code;
|
||||
public ChatCode(ushort raw) {
|
||||
this.Raw = raw;
|
||||
}
|
||||
|
||||
public ChatType Parent() => this.Type switch {
|
||||
|
@ -274,56 +248,6 @@ namespace XIVChatCommon.Message {
|
|||
// }
|
||||
//}
|
||||
|
||||
public NameFormatting? NameFormat() => this.Type switch {
|
||||
ChatType.Say => NameFormatting.Of("", ": "),
|
||||
ChatType.Shout => NameFormatting.Of("", ": "),
|
||||
ChatType.Yell => NameFormatting.Of("", ": "),
|
||||
ChatType.NpcAnnouncement => NameFormatting.Of("", ": "),
|
||||
ChatType.NpcDialogue => NameFormatting.Of("", ": "),
|
||||
ChatType.TellOutgoing => NameFormatting.Of(">> ", ": "),
|
||||
ChatType.TellIncoming => NameFormatting.Of("", " >> "),
|
||||
ChatType.GmTell => NameFormatting.Of("[GM]", " >> "),
|
||||
ChatType.GmSay => NameFormatting.Of("[GM]", ": "),
|
||||
ChatType.GmShout => NameFormatting.Of("[GM]", ": "),
|
||||
ChatType.GmYell => NameFormatting.Of("[GM]", ": "),
|
||||
ChatType.GmParty => NameFormatting.Of("([GM]", ") "),
|
||||
ChatType.GmFreeCompany => NameFormatting.Of("[FC]<[GM]", "> "),
|
||||
ChatType.GmLinkshell1 => NameFormatting.Of("[1]<[GM]", "> "),
|
||||
ChatType.GmLinkshell2 => NameFormatting.Of("[2]<[GM]", "> "),
|
||||
ChatType.GmLinkshell3 => NameFormatting.Of("[3]<[GM]", "> "),
|
||||
ChatType.GmLinkshell4 => NameFormatting.Of("[4]<[GM]", "> "),
|
||||
ChatType.GmLinkshell5 => NameFormatting.Of("[5]<[GM]", "> "),
|
||||
ChatType.GmLinkshell6 => NameFormatting.Of("[6]<[GM]", "> "),
|
||||
ChatType.GmLinkshell7 => NameFormatting.Of("[7]<[GM]", "> "),
|
||||
ChatType.GmLinkshell8 => NameFormatting.Of("[8]<[GM]", "> "),
|
||||
ChatType.GmNoviceNetwork => NameFormatting.Of("[NOVICE][GM]", ": "),
|
||||
ChatType.Party => NameFormatting.Of("(", ") "),
|
||||
ChatType.CrossParty => NameFormatting.Of("(", ") "),
|
||||
ChatType.Alliance => NameFormatting.Of("((", ")) "),
|
||||
ChatType.PvpTeam => NameFormatting.Of("[PVP]<", "> "),
|
||||
ChatType.FreeCompany => NameFormatting.Of("[FC]<", "> "),
|
||||
ChatType.Linkshell1 => NameFormatting.Of("[1]<", "> "),
|
||||
ChatType.Linkshell2 => NameFormatting.Of("[2]<", "> "),
|
||||
ChatType.Linkshell3 => NameFormatting.Of("[3]<", "> "),
|
||||
ChatType.Linkshell4 => NameFormatting.Of("[4]<", "> "),
|
||||
ChatType.Linkshell5 => NameFormatting.Of("[5]<", "> "),
|
||||
ChatType.Linkshell6 => NameFormatting.Of("[6]<", "> "),
|
||||
ChatType.Linkshell7 => NameFormatting.Of("[7]<", "> "),
|
||||
ChatType.Linkshell8 => NameFormatting.Of("[8]<", "> "),
|
||||
ChatType.StandardEmote => NameFormatting.Empty(),
|
||||
ChatType.CustomEmote => NameFormatting.Of("", ""),
|
||||
ChatType.CrossLinkshell1 => NameFormatting.Of("[CWLS1]<", "> "),
|
||||
ChatType.CrossLinkshell2 => NameFormatting.Of("[CWLS2]<", "> "),
|
||||
ChatType.CrossLinkshell3 => NameFormatting.Of("[CWLS3]<", "> "),
|
||||
ChatType.CrossLinkshell4 => NameFormatting.Of("[CWLS4]<", "> "),
|
||||
ChatType.CrossLinkshell5 => NameFormatting.Of("[CWLS5]<", "> "),
|
||||
ChatType.CrossLinkshell6 => NameFormatting.Of("[CWLS6]<", "> "),
|
||||
ChatType.CrossLinkshell7 => NameFormatting.Of("[CWLS7]<", "> "),
|
||||
ChatType.CrossLinkshell8 => NameFormatting.Of("[CWLS8]<", "> "),
|
||||
ChatType.NoviceNetwork => NameFormatting.Of("[NOVICE]", ": "),
|
||||
_ => null,
|
||||
};
|
||||
|
||||
public bool IsBattle() {
|
||||
switch (this.Type) {
|
||||
case ChatType.Damage:
|
||||
|
|
|
@ -443,6 +443,24 @@ namespace XIVChatPlugin {
|
|||
});
|
||||
}
|
||||
|
||||
public class NameFormatting {
|
||||
public string Before { get; private set; } = string.Empty;
|
||||
public string After { get; private set; } = string.Empty;
|
||||
public bool IsPresent { get; private set; } = true;
|
||||
|
||||
public static NameFormatting Empty() {
|
||||
return new NameFormatting {
|
||||
IsPresent = false,
|
||||
};
|
||||
}
|
||||
|
||||
public static NameFormatting Of(string before, string after) {
|
||||
return new NameFormatting {
|
||||
Before = before,
|
||||
After = after,
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
private Dictionary<ChatType, NameFormatting> Formats { get; } = new Dictionary<ChatType, NameFormatting>();
|
||||
|
||||
|
|
Loading…
Reference in New Issue