diff --git a/.editorconfig b/.editorconfig index 753e5bb..5d54b45 100644 --- a/.editorconfig +++ b/.editorconfig @@ -468,7 +468,7 @@ resharper_csharp_align_multiline_extends_list = false resharper_csharp_align_multiline_for_stmt = false resharper_csharp_align_multiline_parameter = false resharper_csharp_align_multiple_declaration = false -resharper_csharp_insert_final_newline = false +resharper_csharp_insert_final_newline = true resharper_csharp_keep_blank_lines_in_code = 1 resharper_csharp_max_line_length = 120 resharper_csharp_naming_rule.enum_member = AaBb @@ -514,14 +514,6 @@ resharper_free_block_braces = next_line resharper_function_declaration_return_type_style = do_not_change resharper_function_definition_return_type_style = do_not_change resharper_generator_mode = false -resharper_html_attribute_indent = align_by_first_attribute -resharper_html_insert_final_newline = false -resharper_html_linebreak_before_elements = body, div, p, form, h1, h2, h3 -resharper_html_max_blank_lines_between_tags = 2 -resharper_html_max_line_length = 120 -resharper_html_pi_attribute_style = on_single_line -resharper_html_space_before_self_closing = false -resharper_html_wrap_lines = true resharper_ignore_space_preservation = false resharper_include_prefix_comment_in_indent = false resharper_indent_access_specifiers_from_class = false @@ -642,7 +634,7 @@ resharper_remove_blank_lines_near_braces_in_declarations = true resharper_remove_this_qualifier = true resharper_requires_expression_braces = next_line resharper_resx_attribute_indent = single_indent -resharper_resx_insert_final_newline = false +resharper_resx_insert_final_newline = true resharper_resx_linebreak_before_elements = resharper_resx_max_blank_lines_between_tags = 0 resharper_resx_max_line_length = 2147483647 @@ -853,7 +845,7 @@ resharper_wrap_switch_expression = chop_always resharper_wrap_ternary_expr_style = chop_if_long resharper_wrap_verbatim_interpolated_strings = no_wrap resharper_xmldoc_attribute_indent = single_indent -resharper_xmldoc_insert_final_newline = false +resharper_xmldoc_insert_final_newline = true resharper_xmldoc_linebreak_before_elements = summary, remarks, example, returns, param, typeparam, value, para resharper_xmldoc_max_blank_lines_between_tags = 0 resharper_xmldoc_max_line_length = 120 @@ -862,16 +854,6 @@ resharper_xmldoc_space_before_self_closing = true resharper_xmldoc_wrap_lines = true resharper_xmldoc_wrap_tags_and_pi = true resharper_xmldoc_wrap_text = true -resharper_xml_attribute_indent = align_by_first_attribute -resharper_xml_insert_final_newline = false -resharper_xml_linebreak_before_elements = -resharper_xml_max_blank_lines_between_tags = 2 -resharper_xml_max_line_length = 120 -resharper_xml_pi_attribute_style = do_not_touch -resharper_xml_space_before_self_closing = true -resharper_xml_wrap_lines = true -resharper_xml_wrap_tags_and_pi = true -resharper_xml_wrap_text = false # ReSharper inspection severities resharper_access_rights_in_text_highlighting = warning diff --git a/src/Boyfriend.cs b/src/Boyfriend.cs index 4794743..a1b6fbd 100644 --- a/src/Boyfriend.cs +++ b/src/Boyfriend.cs @@ -116,4 +116,4 @@ public sealed class Boyfriend .AddFilter("System.Net.Http.HttpClient.*.ClientHandler", LogLevel.Warning) ); } -} \ No newline at end of file +} diff --git a/src/ColorsList.cs b/src/ColorsList.cs index 795d16e..fc32274 100644 --- a/src/ColorsList.cs +++ b/src/ColorsList.cs @@ -16,4 +16,4 @@ public static class ColorsList public static readonly Color Cyan = Color.LightSkyBlue; public static readonly Color Black = Color.Black; public static readonly Color White = Color.WhiteSmoke; -} \ No newline at end of file +} diff --git a/src/Commands/AboutCommandGroup.cs b/src/Commands/AboutCommandGroup.cs index b59b916..34ba68d 100644 --- a/src/Commands/AboutCommandGroup.cs +++ b/src/Commands/AboutCommandGroup.cs @@ -89,4 +89,4 @@ public class AboutCommandGroup : CommandGroup return await _feedback.SendContextualEmbedResultAsync(embed, ct); } -} \ No newline at end of file +} diff --git a/src/Commands/BanCommandGroup.cs b/src/Commands/BanCommandGroup.cs index ccabdb3..ea03009 100644 --- a/src/Commands/BanCommandGroup.cs +++ b/src/Commands/BanCommandGroup.cs @@ -278,4 +278,4 @@ public class BanCommandGroup : CommandGroup return await _feedback.SendContextualEmbedResultAsync(embed, ct); } -} \ No newline at end of file +} diff --git a/src/Commands/ClearCommandGroup.cs b/src/Commands/ClearCommandGroup.cs index 578bd3b..5ad8b33 100644 --- a/src/Commands/ClearCommandGroup.cs +++ b/src/Commands/ClearCommandGroup.cs @@ -131,4 +131,4 @@ public class ClearCommandGroup : CommandGroup return await _feedback.SendContextualEmbedResultAsync(embed, ct); } -} \ No newline at end of file +} diff --git a/src/Commands/Events/ErrorLoggingPostExecutionEvent.cs b/src/Commands/Events/ErrorLoggingPostExecutionEvent.cs index 8d47867..009bfa1 100644 --- a/src/Commands/Events/ErrorLoggingPostExecutionEvent.cs +++ b/src/Commands/Events/ErrorLoggingPostExecutionEvent.cs @@ -42,4 +42,4 @@ public class ErrorLoggingPostExecutionEvent : IPostExecutionEvent return Task.FromResult(Result.FromSuccess()); } -} \ No newline at end of file +} diff --git a/src/Commands/Events/LoggingPreparationErrorEvent.cs b/src/Commands/Events/LoggingPreparationErrorEvent.cs index 726fe29..f6c1e1f 100644 --- a/src/Commands/Events/LoggingPreparationErrorEvent.cs +++ b/src/Commands/Events/LoggingPreparationErrorEvent.cs @@ -42,4 +42,4 @@ public class LoggingPreparationErrorEvent : IPreparationErrorEvent return Task.FromResult(Result.FromSuccess()); } -} \ No newline at end of file +} diff --git a/src/Commands/KickCommandGroup.cs b/src/Commands/KickCommandGroup.cs index 6e70fb3..45da191 100644 --- a/src/Commands/KickCommandGroup.cs +++ b/src/Commands/KickCommandGroup.cs @@ -170,4 +170,4 @@ public class KickCommandGroup : CommandGroup return await _feedback.SendContextualEmbedResultAsync(embed, ct); } -} \ No newline at end of file +} diff --git a/src/Commands/MuteCommandGroup.cs b/src/Commands/MuteCommandGroup.cs index f1c2cf8..a35699b 100644 --- a/src/Commands/MuteCommandGroup.cs +++ b/src/Commands/MuteCommandGroup.cs @@ -257,4 +257,4 @@ public class MuteCommandGroup : CommandGroup return await _feedback.SendContextualEmbedResultAsync(embed, ct); } -} \ No newline at end of file +} diff --git a/src/Commands/PingCommandGroup.cs b/src/Commands/PingCommandGroup.cs index a3007db..e52f22c 100644 --- a/src/Commands/PingCommandGroup.cs +++ b/src/Commands/PingCommandGroup.cs @@ -98,4 +98,4 @@ public class PingCommandGroup : CommandGroup return await _feedback.SendContextualEmbedResultAsync(embed, ct); } -} \ No newline at end of file +} diff --git a/src/Commands/RemindCommandGroup.cs b/src/Commands/RemindCommandGroup.cs index 676ecc4..3f588aa 100644 --- a/src/Commands/RemindCommandGroup.cs +++ b/src/Commands/RemindCommandGroup.cs @@ -92,4 +92,4 @@ public class RemindCommandGroup : CommandGroup return await _feedback.SendContextualEmbedResultAsync(embed, ct); } -} \ No newline at end of file +} diff --git a/src/Commands/SettingsCommandGroup.cs b/src/Commands/SettingsCommandGroup.cs index cf55e3c..758bd83 100644 --- a/src/Commands/SettingsCommandGroup.cs +++ b/src/Commands/SettingsCommandGroup.cs @@ -205,4 +205,4 @@ public class SettingsCommandGroup : CommandGroup return await _feedback.SendContextualEmbedResultAsync(embed, ct); } -} \ No newline at end of file +} diff --git a/src/Data/GuildData.cs b/src/Data/GuildData.cs index 8797e7f..5adb869 100644 --- a/src/Data/GuildData.cs +++ b/src/Data/GuildData.cs @@ -41,4 +41,4 @@ public sealed class GuildData MemberData.Add(userId.Value, newData); return newData; } -} \ No newline at end of file +} diff --git a/src/Data/GuildSettings.cs b/src/Data/GuildSettings.cs index 0b27952..1c94835 100644 --- a/src/Data/GuildSettings.cs +++ b/src/Data/GuildSettings.cs @@ -66,4 +66,4 @@ public static class GuildSettings /// public static readonly TimeSpanOption EventEarlyNotificationOffset = new( "EventEarlyNotificationOffset", TimeSpan.Zero); -} \ No newline at end of file +} diff --git a/src/Data/MemberData.cs b/src/Data/MemberData.cs index 5df7a24..f028938 100644 --- a/src/Data/MemberData.cs +++ b/src/Data/MemberData.cs @@ -15,4 +15,4 @@ public sealed class MemberData public DateTimeOffset? BannedUntil { get; set; } public List Roles { get; set; } = new(); public List Reminders { get; } = new(); -} \ No newline at end of file +} diff --git a/src/Data/Options/BoolOption.cs b/src/Data/Options/BoolOption.cs index b84af21..51cd3a1 100644 --- a/src/Data/Options/BoolOption.cs +++ b/src/Data/Options/BoolOption.cs @@ -38,4 +38,4 @@ public sealed class BoolOption : Option return false; } } -} \ No newline at end of file +} diff --git a/src/Data/Options/IOption.cs b/src/Data/Options/IOption.cs index 534ac14..6f435e5 100644 --- a/src/Data/Options/IOption.cs +++ b/src/Data/Options/IOption.cs @@ -8,4 +8,4 @@ public interface IOption string Name { get; } string Display(JsonNode settings); Result Set(JsonNode settings, string from); -} \ No newline at end of file +} diff --git a/src/Data/Options/LanguageOption.cs b/src/Data/Options/LanguageOption.cs index 0ec2eb0..a82d7f6 100644 --- a/src/Data/Options/LanguageOption.cs +++ b/src/Data/Options/LanguageOption.cs @@ -36,4 +36,4 @@ public sealed class LanguageOption : Option ? base.Set(settings, from.ToLowerInvariant()) : new ArgumentInvalidError(nameof(from), Messages.LanguageNotSupported); } -} \ No newline at end of file +} diff --git a/src/Data/Options/Option.cs b/src/Data/Options/Option.cs index 67a0cd9..c96b6ac 100644 --- a/src/Data/Options/Option.cs +++ b/src/Data/Options/Option.cs @@ -48,4 +48,4 @@ public class Option : IOption var property = settings[Name]; return property != null ? property.GetValue() : DefaultValue; } -} \ No newline at end of file +} diff --git a/src/Data/Options/SnowflakeOption.cs b/src/Data/Options/SnowflakeOption.cs index 86e4676..7391b00 100644 --- a/src/Data/Options/SnowflakeOption.cs +++ b/src/Data/Options/SnowflakeOption.cs @@ -36,4 +36,4 @@ public sealed partial class SnowflakeOption : Option [GeneratedRegex("[^0-9]")] private static partial Regex NonNumbers(); -} \ No newline at end of file +} diff --git a/src/Data/Options/TimeSpanOption.cs b/src/Data/Options/TimeSpanOption.cs index 61b1ee1..5e39cf0 100644 --- a/src/Data/Options/TimeSpanOption.cs +++ b/src/Data/Options/TimeSpanOption.cs @@ -31,4 +31,4 @@ public sealed class TimeSpanOption : Option { return Parser.TryParseAsync(from).AsTask().GetAwaiter().GetResult(); } -} \ No newline at end of file +} diff --git a/src/Data/Reminder.cs b/src/Data/Reminder.cs index 042afdb..a332003 100644 --- a/src/Data/Reminder.cs +++ b/src/Data/Reminder.cs @@ -5,4 +5,4 @@ public struct Reminder public DateTimeOffset At; public string Text; public ulong Channel; -} \ No newline at end of file +} diff --git a/src/Data/ScheduledEventData.cs b/src/Data/ScheduledEventData.cs index ac299e3..29075f5 100644 --- a/src/Data/ScheduledEventData.cs +++ b/src/Data/ScheduledEventData.cs @@ -16,4 +16,4 @@ public sealed class ScheduledEventData public bool EarlyNotificationSent { get; set; } public DateTimeOffset? ActualStartTime { get; set; } public GuildScheduledEventStatus Status { get; set; } -} \ No newline at end of file +} diff --git a/src/Extensions.cs b/src/Extensions.cs index b66dff1..df2e548 100644 --- a/src/Extensions.cs +++ b/src/Extensions.cs @@ -258,4 +258,4 @@ public static class Extensions return (Result)await feedback.SendContextualEmbedAsync(embed, ct: ct); } -} \ No newline at end of file +} diff --git a/src/InteractionResponders.cs b/src/InteractionResponders.cs index 6525e6e..d3916b0 100644 --- a/src/InteractionResponders.cs +++ b/src/InteractionResponders.cs @@ -39,4 +39,4 @@ public class InteractionResponders : InteractionGroup $"https://discord.com/events/{idArray[0]}/{idArray[1]}", options: new FeedbackMessageOptions(MessageFlags: MessageFlags.Ephemeral), ct: CancellationToken); } -} \ No newline at end of file +} diff --git a/src/Responders/GuildLoadedResponder.cs b/src/Responders/GuildLoadedResponder.cs index 9cb423c..5c1ea9b 100644 --- a/src/Responders/GuildLoadedResponder.cs +++ b/src/Responders/GuildLoadedResponder.cs @@ -77,4 +77,4 @@ public class GuildLoadedResponder : IResponder return (Result)await _channelApi.CreateMessageAsync( GuildSettings.PrivateFeedbackChannel.Get(cfg), embeds: new[] { built }, ct: ct); } -} \ No newline at end of file +} diff --git a/src/Responders/GuildMemberJoinedResponder.cs b/src/Responders/GuildMemberJoinedResponder.cs index 993c7ed..bb60b0b 100644 --- a/src/Responders/GuildMemberJoinedResponder.cs +++ b/src/Responders/GuildMemberJoinedResponder.cs @@ -81,4 +81,4 @@ public class GuildMemberJoinedResponder : IResponder GuildSettings.PublicFeedbackChannel.Get(cfg), embeds: new[] { built }, allowedMentions: Boyfriend.NoMentions, ct: ct); } -} \ No newline at end of file +} diff --git a/src/Responders/GuildMemberRolesUpdatedResponder.cs b/src/Responders/GuildMemberRolesUpdatedResponder.cs index ab40713..dbd8b3a 100644 --- a/src/Responders/GuildMemberRolesUpdatedResponder.cs +++ b/src/Responders/GuildMemberRolesUpdatedResponder.cs @@ -26,4 +26,4 @@ public class GuildMemberUpdateResponder : IResponder memberData.Roles = gatewayEvent.Roles.ToList().ConvertAll(r => r.Value); return Result.FromSuccess(); } -} \ No newline at end of file +} diff --git a/src/Responders/MessageDeletedResponder.cs b/src/Responders/MessageDeletedResponder.cs index 25dce13..3611f80 100644 --- a/src/Responders/MessageDeletedResponder.cs +++ b/src/Responders/MessageDeletedResponder.cs @@ -101,4 +101,4 @@ public class MessageDeletedResponder : IResponder GuildSettings.PrivateFeedbackChannel.Get(cfg), embeds: new[] { built }, allowedMentions: Boyfriend.NoMentions, ct: ct); } -} \ No newline at end of file +} diff --git a/src/Responders/MessageEditedResponder.cs b/src/Responders/MessageEditedResponder.cs index bdc14b6..7e02f9f 100644 --- a/src/Responders/MessageEditedResponder.cs +++ b/src/Responders/MessageEditedResponder.cs @@ -118,4 +118,4 @@ public class MessageEditedResponder : IResponder GuildSettings.PrivateFeedbackChannel.Get(cfg), embeds: new[] { built }, allowedMentions: Boyfriend.NoMentions, ct: ct); } -} \ No newline at end of file +} diff --git a/src/Responders/MessageReceivedResponder.cs b/src/Responders/MessageReceivedResponder.cs index 1bc282a..cadef5f 100644 --- a/src/Responders/MessageReceivedResponder.cs +++ b/src/Responders/MessageReceivedResponder.cs @@ -35,4 +35,4 @@ public class MessageCreateResponder : IResponder }); return Task.FromResult(Result.FromSuccess()); } -} \ No newline at end of file +} diff --git a/src/Responders/ScheduledEventCancelledResponder.cs b/src/Responders/ScheduledEventCancelledResponder.cs index 6779e4b..c35128a 100644 --- a/src/Responders/ScheduledEventCancelledResponder.cs +++ b/src/Responders/ScheduledEventCancelledResponder.cs @@ -50,4 +50,4 @@ public class GuildScheduledEventDeleteResponder : IResponder