Format the project with 'dotnet format' (#2551)

* Sync and Re-Format

* Fix Title string.

* Fix indentation.

samples/BasicBot/Program.cs

@@ -1,8 +1,8 @@
+using Discord;
+using Discord.WebSocket;
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using Discord;
-using Discord.WebSocket;
 
 namespace BasicBot
 {
@@ -112,7 +112,8 @@ namespace BasicBot
                 if (component.Data.CustomId == "unique-id")
                     await interaction.RespondAsync("Thank you for clicking my button!");
 
-                else Console.WriteLine("An ID has been received that has no handler!");
+                else
+                    Console.WriteLine("An ID has been received that has no handler!");
             }
         }
     }

samples/InteractionFramework/Attributes/DoUserCheckAttribute.cs

@@ -30,7 +30,8 @@ namespace InteractionFramework.Attributes
                         ? Task.FromResult(PreconditionResult.FromSuccess())
                         : Task.FromResult(PreconditionResult.FromError("User ID does not match component ID!"));
 
-                else return Task.FromResult(PreconditionResult.FromError("Parse cannot be done if no userID exists."));
+                else
+                    return Task.FromResult(PreconditionResult.FromError("Parse cannot be done if no userID exists."));
             }
         }
     }

src/Discord.Net.Analyzers/GuildAccessAnalyzer.cs

@@ -1,11 +1,11 @@
-using System;
+using Discord.Commands;
-using System.Collections.Immutable;
-using System.Linq;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Diagnostics;
-using Discord.Commands;
+using System;
+using System.Collections.Immutable;
+using System.Linq;
 
 namespace Discord.Analyzers
 {

src/Discord.Net.Analyzers/SymbolExtensions.cs

@@ -1,6 +1,6 @@
-using System;
-using Microsoft.CodeAnalysis;
 using Discord.Commands;
+using Microsoft.CodeAnalysis;
+using System;
 
 namespace Discord.Analyzers
 {

src/Discord.Net.Commands/Builders/CommandBuilder.cs

@@ -1,7 +1,7 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using System.Collections.Generic;
 
 namespace Discord.Commands.Builders
 {

src/Discord.Net.Commands/Builders/ModuleBuilder.cs

@@ -20,7 +20,9 @@ namespace Discord.Commands.Builders
         public string Name { get; set; }
         public string Summary { get; set; }
         public string Remarks { get; set; }
-        public string Group { get => _group;
+        public string Group
+        {
+            get => _group;
             set
             {
                 _aliases.Remove(_group);

src/Discord.Net.Commands/Builders/ModuleClassBuilder.cs

@@ -1,11 +1,10 @@
+using Discord.Commands.Builders;
 using System;
-using System.Linq;
 using System.Collections.Generic;
+using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
 
-using Discord.Commands.Builders;
-
 namespace Discord.Commands
 {
     internal static class ModuleClassBuilder

src/Discord.Net.Commands/Builders/ParameterBuilder.cs

@@ -1,9 +1,8 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 
-using System.Collections.Generic;
-
 namespace Discord.Commands.Builders
 {
     public class ParameterBuilder

src/Discord.Net.Commands/CommandService.cs

@@ -1,3 +1,5 @@
+using Discord.Commands.Builders;
+using Discord.Logging;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -6,8 +8,6 @@ using System.Linq;
 using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
-using Discord.Commands.Builders;
-using Discord.Logging;
 
 namespace Discord.Commands
 {

src/Discord.Net.Commands/Extensions/MessageExtensions.cs

@@ -45,13 +45,17 @@ namespace Discord.Commands
         public static bool HasMentionPrefix(this IUserMessage msg, IUser user, ref int argPos)
         {
             var text = msg.Content;
-            if (string.IsNullOrEmpty(text) || text.Length <= 3 || text[0] != '<' || text[1] != '@') return false;
+            if (string.IsNullOrEmpty(text) || text.Length <= 3 || text[0] != '<' || text[1] != '@')
+                return false;
 
             int endPos = text.IndexOf('>');
-            if (endPos == -1) return false;
+            if (endPos == -1)
-            if (text.Length < endPos + 2 || text[endPos + 1] != ' ') return false; //Must end in "> "
+                return false;
+            if (text.Length < endPos + 2 || text[endPos + 1] != ' ')
+                return false; //Must end in "> "
 
-            if (!MentionUtils.TryParseUser(text.Substring(0, endPos + 1), out ulong userId)) return false;
+            if (!MentionUtils.TryParseUser(text.Substring(0, endPos + 1), out ulong userId))
+                return false;
             if (userId == user.Id)
             {
                 argPos = endPos + 2;

src/Discord.Net.Commands/Info/CommandInfo.cs

@@ -1,8 +1,8 @@
 using Discord.Commands.Builders;
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Collections.Immutable;
-using System.Collections.Concurrent;
 using System.Diagnostics;
 using System.Linq;
 using System.Reflection;

src/Discord.Net.Commands/Info/ModuleInfo.cs

@@ -1,8 +1,8 @@
+using Discord.Commands.Builders;
 using System;
-using System.Linq;
 using System.Collections.Generic;
 using System.Collections.Immutable;
-using Discord.Commands.Builders;
+using System.Linq;
 
 namespace Discord.Commands
 {

src/Discord.Net.Commands/ModuleBase.cs

@@ -1,6 +1,6 @@
+using Discord.Commands.Builders;
 using System;
 using System.Threading.Tasks;
-using Discord.Commands.Builders;
 
 namespace Discord.Commands
 {

src/Discord.Net.Core/Audio/AudioInStream.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 

src/Discord.Net.Core/Entities/ApplicationRoleConnection/RoleConnectionMetadataProperties.cs

@@ -1,5 +1,5 @@
-using System.Collections.Generic;
 using System;
+using System.Collections.Generic;
 using System.Collections.Immutable;
 
 namespace Discord;

src/Discord.Net.Core/Entities/Channels/AudioChannelProperties.cs

@@ -1,4 +1,4 @@
-namespace Discord
+namespace Discord
 {
     /// <summary>
     ///     Provides properties that are used to modify an <see cref="IAudioChannel" /> with the specified changes.

src/Discord.Net.Core/Entities/Emotes/Emote.cs

@@ -1,6 +1,6 @@
 using System;
-using System.Globalization;
 using System.Diagnostics;
+using System.Globalization;
 
 namespace Discord
 {
@@ -44,11 +44,14 @@ namespace Discord
         /// <param name="other">The object to compare with the current object.</param>
         public override bool Equals(object other)
         {
-            if (other == null) return false;
+            if (other == null)
-            if (other == this) return true;
+                return false;
+            if (other == this)
+                return true;
 
             var otherEmote = other as Emote;
-            if (otherEmote == null) return false;
+            if (otherEmote == null)
+                return false;
 
             return Id == otherEmote.Id;
         }

src/Discord.Net.Core/Entities/Interactions/MessageComponents/TextInputStyle.cs

@@ -1,4 +1,4 @@
-namespace Discord
+namespace Discord
 {
     public enum TextInputStyle
     {

src/Discord.Net.Core/Entities/Messages/EmbedBuilder.cs

@@ -1,9 +1,9 @@
+using Discord.Utils;
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
-using Discord.Utils;
-using Newtonsoft.Json;
 
 namespace Discord
 {
@@ -50,7 +50,8 @@ namespace Discord
             get => _title;
             set
             {
-                if (value?.Length > MaxTitleLength) throw new ArgumentException(message: $"Title length must be less than or equal to {MaxTitleLength}.", paramName: nameof(Title));
+                if (value?.Length > MaxTitleLength)
+                    throw new ArgumentException(message: $"Title length must be less than or equal to {MaxTitleLength}.", paramName: nameof(Title));
                 _title = value;
             }
         }
@@ -63,7 +64,8 @@ namespace Discord
             get => _description;
             set
             {
-                if (value?.Length > MaxDescriptionLength) throw new ArgumentException(message: $"Description length must be less than or equal to {MaxDescriptionLength}.", paramName: nameof(Description));
+                if (value?.Length > MaxDescriptionLength)
+                    throw new ArgumentException(message: $"Description length must be less than or equal to {MaxDescriptionLength}.", paramName: nameof(Description));
                 _description = value;
             }
         }
@@ -100,8 +102,10 @@ namespace Discord
             get => _fields;
             set
             {
-                if (value == null) throw new ArgumentNullException(paramName: nameof(Fields), message: "Cannot set an embed builder's fields collection to null.");
+                if (value == null)
-                if (value.Count > MaxFieldCount) throw new ArgumentException(message: $"Field count must be less than or equal to {MaxFieldCount}.", paramName: nameof(Fields));
+                    throw new ArgumentNullException(paramName: nameof(Fields), message: "Cannot set an embed builder's fields collection to null.");
+                if (value.Count > MaxFieldCount)
+                    throw new ArgumentException(message: $"Field count must be less than or equal to {MaxFieldCount}.", paramName: nameof(Fields));
                 _fields = value;
             }
         }
@@ -564,8 +568,10 @@ namespace Discord
             get => _name;
             set
             {
-                if (string.IsNullOrWhiteSpace(value)) throw new ArgumentException(message: "Field name must not be null, empty or entirely whitespace.", paramName: nameof(Name));
+                if (string.IsNullOrWhiteSpace(value))
-                if (value.Length > MaxFieldNameLength) throw new ArgumentException(message: $"Field name length must be less than or equal to {MaxFieldNameLength}.", paramName: nameof(Name));
+                    throw new ArgumentException(message: "Field name must not be null, empty or entirely whitespace.", paramName: nameof(Name));
+                if (value.Length > MaxFieldNameLength)
+                    throw new ArgumentException(message: $"Field name length must be less than or equal to {MaxFieldNameLength}.", paramName: nameof(Name));
                 _name = value;
             }
         }
@@ -587,8 +593,10 @@ namespace Discord
             set
             {
                 var stringValue = value?.ToString();
-                if (string.IsNullOrWhiteSpace(stringValue)) throw new ArgumentException(message: "Field value must not be null or empty.", paramName: nameof(Value));
+                if (string.IsNullOrWhiteSpace(stringValue))
-                if (stringValue.Length > MaxFieldValueLength) throw new ArgumentException(message: $"Field value length must be less than or equal to {MaxFieldValueLength}.", paramName: nameof(Value));
+                    throw new ArgumentException(message: "Field value must not be null or empty.", paramName: nameof(Value));
+                if (stringValue.Length > MaxFieldValueLength)
+                    throw new ArgumentException(message: $"Field value length must be less than or equal to {MaxFieldValueLength}.", paramName: nameof(Value));
                 _value = stringValue;
             }
         }
@@ -704,7 +712,8 @@ namespace Discord
             get => _name;
             set
             {
-                if (value?.Length > MaxAuthorNameLength) throw new ArgumentException(message: $"Author name length must be less than or equal to {MaxAuthorNameLength}.", paramName: nameof(Name));
+                if (value?.Length > MaxAuthorNameLength)
+                    throw new ArgumentException(message: $"Author name length must be less than or equal to {MaxAuthorNameLength}.", paramName: nameof(Name));
                 _name = value;
             }
         }
@@ -836,7 +845,8 @@ namespace Discord
             get => _text;
             set
             {
-                if (value?.Length > MaxFooterTextLength) throw new ArgumentException(message: $"Footer text length must be less than or equal to {MaxFooterTextLength}.", paramName: nameof(Text));
+                if (value?.Length > MaxFooterTextLength)
+                    throw new ArgumentException(message: $"Footer text length must be less than or equal to {MaxFooterTextLength}.", paramName: nameof(Text));
                 _text = value;
             }
         }

src/Discord.Net.Core/Entities/Messages/ITag.cs

@@ -1,4 +1,4 @@
-namespace Discord
+namespace Discord
 {
     public interface ITag
     {

src/Discord.Net.Core/Entities/Messages/Tag.cs

@@ -1,4 +1,4 @@
-using System.Diagnostics;
+using System.Diagnostics;
 
 namespace Discord
 {

src/Discord.Net.Core/Entities/Permissions/OverwritePermissions.cs

@@ -225,7 +225,8 @@ namespace Discord
                   embedLinks, attachFiles, readMessageHistory, mentionEveryone, useExternalEmojis, connect, speak, muteMembers, deafenMembers,
                   moveMembers, useVoiceActivation, manageRoles, manageWebhooks, prioritySpeaker, stream, useSlashCommands, useApplicationCommands,
                   requestToSpeak, manageThreads, createPublicThreads, createPrivateThreads, usePublicThreads, usePrivateThreads, useExternalStickers,
-                  sendMessagesInThreads, startEmbeddedActivities) { }
+                  sendMessagesInThreads, startEmbeddedActivities)
+        { }
 
         /// <summary>
         ///     Initializes a new <see cref="OverwritePermissions" /> from the current one, changing the provided

src/Discord.Net.Core/Extensions/TaskCompletionSourceExtensions.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading.Tasks;
 
 namespace Discord

src/Discord.Net.Core/Extensions/UserExtensions.cs

@@ -1,7 +1,7 @@
 using System;
-using System.Threading.Tasks;
 using System.Collections.Generic;
 using System.IO;
+using System.Threading.Tasks;
 
 namespace Discord
 {

src/Discord.Net.Core/Net/Rest/RestClientProvider.cs

@@ -1,4 +1,4 @@
-namespace Discord.Net.Rest
+namespace Discord.Net.Rest
 {
     public delegate IRestClient RestClientProvider(string baseUrl);
 }

src/Discord.Net.Core/Net/Rest/RestResponse.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using System.Net;
 

src/Discord.Net.Core/Net/Udp/IUdpSocket.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 

src/Discord.Net.Core/Net/Udp/UdpSocketProvider.cs

@@ -1,4 +1,4 @@
-namespace Discord.Net.Udp
+namespace Discord.Net.Udp
 {
     public delegate IUdpSocket UdpSocketProvider();
 }

src/Discord.Net.Core/Net/WebSockets/IWebSocketClient.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 

src/Discord.Net.Core/Net/WebSockets/WebSocketProvider.cs

@@ -1,4 +1,4 @@
-namespace Discord.Net.WebSockets
+namespace Discord.Net.WebSockets
 {
     public delegate IWebSocketClient WebSocketProvider();
 }

src/Discord.Net.Core/Utils/AsyncEvent.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Threading.Tasks;

src/Discord.Net.Core/Utils/ConcurrentHashSet.cs

@@ -161,7 +161,8 @@ namespace Discord
         public ConcurrentHashSet(IEnumerable<T> collection, IEqualityComparer<T> comparer)
             : this(comparer)
         {
-            if (collection == null) throw new ArgumentNullException(paramName: nameof(collection));
+            if (collection == null)
+                throw new ArgumentNullException(paramName: nameof(collection));
             InitializeFromCollection(collection);
         }
         /// <exception cref="ArgumentNullException">
@@ -170,17 +171,22 @@ namespace Discord
         public ConcurrentHashSet(int concurrencyLevel, IEnumerable<T> collection, IEqualityComparer<T> comparer)
             : this(concurrencyLevel, DefaultCapacity, false, comparer)
         {
-            if (collection == null) throw new ArgumentNullException(paramName: nameof(collection));
+            if (collection == null)
-            if (comparer == null) throw new ArgumentNullException(paramName: nameof(comparer));
+                throw new ArgumentNullException(paramName: nameof(collection));
+            if (comparer == null)
+                throw new ArgumentNullException(paramName: nameof(comparer));
             InitializeFromCollection(collection);
         }
         public ConcurrentHashSet(int concurrencyLevel, int capacity, IEqualityComparer<T> comparer)
             : this(concurrencyLevel, capacity, false, comparer) { }
         internal ConcurrentHashSet(int concurrencyLevel, int capacity, bool growLockArray, IEqualityComparer<T> comparer)
         {
-            if (concurrencyLevel < 1) throw new ArgumentOutOfRangeException(paramName: nameof(concurrencyLevel));
+            if (concurrencyLevel < 1)
-            if (capacity < 0) throw new ArgumentOutOfRangeException(paramName: nameof(capacity));
+                throw new ArgumentOutOfRangeException(paramName: nameof(concurrencyLevel));
-            if (comparer == null) throw new ArgumentNullException(paramName: nameof(comparer));
+            if (capacity < 0)
+                throw new ArgumentOutOfRangeException(paramName: nameof(capacity));
+            if (comparer == null)
+                throw new ArgumentNullException(paramName: nameof(comparer));
 
             if (capacity < concurrencyLevel)
                 capacity = concurrencyLevel;
@@ -201,7 +207,8 @@ namespace Discord
         {
             foreach (var value in collection)
             {
-                if (value == null) throw new ArgumentNullException(paramName: "key");
+                if (value == null)
+                    throw new ArgumentNullException(paramName: "key");
 
                 if (!TryAddInternal(value, _comparer.GetHashCode(value), false))
                     throw new ArgumentException();
@@ -213,7 +220,8 @@ namespace Discord
         /// <exception cref="ArgumentNullException"><paramref name="value"/> is <c>null</c></exception>
         public bool ContainsKey(T value)
         {
-            if (value == null) throw new ArgumentNullException(paramName: "key");
+            if (value == null)
+                throw new ArgumentNullException(paramName: "key");
             return ContainsKeyInternal(value, _comparer.GetHashCode(value));
         }
         private bool ContainsKeyInternal(T value, int hashcode)
@@ -237,7 +245,8 @@ namespace Discord
         /// <exception cref="ArgumentNullException"><paramref name="value"/> is <c>null</c></exception>
         public bool TryAdd(T value)
         {
-            if (value == null) throw new ArgumentNullException(paramName: "key");
+            if (value == null)
+                throw new ArgumentNullException(paramName: "key");
             return TryAddInternal(value, _comparer.GetHashCode(value), true);
         }
         private bool TryAddInternal(T value, int hashcode, bool acquireLock)
@@ -266,7 +275,8 @@ namespace Discord
                     }
 
                     Volatile.Write(ref tables._buckets[bucketNo], new Node(value, hashcode, tables._buckets[bucketNo]));
-                    checked { tables._countPerLock[lockNo]++; }
+                    checked
+                    { tables._countPerLock[lockNo]++; }
 
                     if (tables._countPerLock[lockNo] > _budget)
                         resizeDesired = true;
@@ -287,7 +297,8 @@ namespace Discord
         /// <exception cref="ArgumentNullException"><paramref name="value"/> is <c>null</c></exception>
         public bool TryRemove(T value)
         {
-            if (value == null) throw new ArgumentNullException(paramName: "key");
+            if (value == null)
+                throw new ArgumentNullException(paramName: "key");
             return TryRemoveInternal(value);
         }
         private bool TryRemoveInternal(T value)
@@ -432,7 +443,8 @@ namespace Discord
 
                         newBuckets[newBucketNo] = new Node(current._value, current._hashcode, newBuckets[newBucketNo]);
 
-                        checked { newCountPerLock[newLockNo]++; }
+                        checked
+                        { newCountPerLock[newLockNo]++; }
 
                         current = next;
                     }

src/Discord.Net.Core/Utils/MentionUtils.cs

@@ -136,27 +136,33 @@ namespace Discord
                 switch (tag.Type)
                 {
                     case TagType.UserMention:
-                        if (userHandling == TagHandling.Ignore) continue;
+                        if (userHandling == TagHandling.Ignore)
+                            continue;
                         newText = ResolveUserMention(tag, userHandling);
                         break;
                     case TagType.ChannelMention:
-                        if (channelHandling == TagHandling.Ignore) continue;
+                        if (channelHandling == TagHandling.Ignore)
+                            continue;
                         newText = ResolveChannelMention(tag, channelHandling);
                         break;
                     case TagType.RoleMention:
-                        if (roleHandling == TagHandling.Ignore) continue;
+                        if (roleHandling == TagHandling.Ignore)
+                            continue;
                         newText = ResolveRoleMention(tag, roleHandling);
                         break;
                     case TagType.EveryoneMention:
-                        if (everyoneHandling == TagHandling.Ignore) continue;
+                        if (everyoneHandling == TagHandling.Ignore)
+                            continue;
                         newText = ResolveEveryoneMention(tag, everyoneHandling);
                         break;
                     case TagType.HereMention:
-                        if (everyoneHandling == TagHandling.Ignore) continue;
+                        if (everyoneHandling == TagHandling.Ignore)
+                            continue;
                         newText = ResolveHereMention(tag, everyoneHandling);
                         break;
                     case TagType.Emoji:
-                        if (emojiHandling == TagHandling.Ignore) continue;
+                        if (emojiHandling == TagHandling.Ignore)
+                            continue;
                         newText = ResolveEmoji(tag, emojiHandling);
                         break;
                 }

src/Discord.Net.Core/Utils/Optional.cs

@@ -36,8 +36,10 @@ namespace Discord
 
         public override bool Equals(object other)
         {
-            if (!IsSpecified) return other == null;
+            if (!IsSpecified)
-            if (other == null) return false;
+                return other == null;
+            if (other == null)
+                return false;
             return _value.Equals(other);
         }
         public override int GetHashCode() => IsSpecified ? _value.GetHashCode() : 0;

src/Discord.Net.Core/Utils/Paging/Page.cs

@@ -1,4 +1,4 @@
-using System.Collections;
+using System.Collections;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 

src/Discord.Net.Core/Utils/Paging/PageInfo.cs

@@ -1,4 +1,4 @@
-namespace Discord
+namespace Discord
 {
     internal class PageInfo
     {

src/Discord.Net.Core/Utils/Preconditions.cs

@@ -12,8 +12,10 @@ namespace Discord
 
         private static ArgumentNullException CreateNotNullException(string name, string msg)
         {
-            if (msg == null) return new ArgumentNullException(paramName: name);
+            if (msg == null)
-            else return new ArgumentNullException(paramName: name, message: msg);
+                return new ArgumentNullException(paramName: name);
+            else
+                return new ArgumentNullException(paramName: name, message: msg);
         }
         #endregion
 
@@ -26,8 +28,10 @@ namespace Discord
         /// <exception cref="ArgumentNullException"><paramref name="obj"/> must not be <see langword="null"/>.</exception>
         public static void NotNullOrEmpty(string obj, string name, string msg = null)
         {
-            if (obj == null) throw CreateNotNullException(name, msg);
+            if (obj == null)
-            if (obj.Length == 0) throw CreateNotEmptyException(name, msg);
+                throw CreateNotNullException(name, msg);
+            if (obj.Length == 0)
+                throw CreateNotEmptyException(name, msg);
         }
         /// <exception cref="ArgumentException"><paramref name="obj"/> cannot be blank.</exception>
         /// <exception cref="ArgumentNullException"><paramref name="obj"/> must not be <see langword="null"/>.</exception>
@@ -35,16 +39,20 @@ namespace Discord
         {
             if (obj.IsSpecified)
             {
-                if (obj.Value == null) throw CreateNotNullException(name, msg);
+                if (obj.Value == null)
-                if (obj.Value.Length == 0) throw CreateNotEmptyException(name, msg);
+                    throw CreateNotNullException(name, msg);
+                if (obj.Value.Length == 0)
+                    throw CreateNotEmptyException(name, msg);
             }
         }
         /// <exception cref="ArgumentException"><paramref name="obj"/> cannot be blank.</exception>
         /// <exception cref="ArgumentNullException"><paramref name="obj"/> must not be <see langword="null"/>.</exception>
         public static void NotNullOrWhitespace(string obj, string name, string msg = null)
         {
-            if (obj == null) throw CreateNotNullException(name, msg);
+            if (obj == null)
-            if (obj.Trim().Length == 0) throw CreateNotEmptyException(name, msg);
+                throw CreateNotNullException(name, msg);
+            if (obj.Trim().Length == 0)
+                throw CreateNotEmptyException(name, msg);
         }
         /// <exception cref="ArgumentException"><paramref name="obj"/> cannot be blank.</exception>
         /// <exception cref="ArgumentNullException"><paramref name="obj"/> must not be <see langword="null"/>.</exception>
@@ -52,8 +60,10 @@ namespace Discord
         {
             if (obj.IsSpecified)
             {
-                if (obj.Value == null) throw CreateNotNullException(name, msg);
+                if (obj.Value == null)
-                if (obj.Value.Trim().Length == 0) throw CreateNotEmptyException(name, msg);
+                    throw CreateNotNullException(name, msg);
+                if (obj.Value.Trim().Length == 0)
+                    throw CreateNotEmptyException(name, msg);
             }
         }
 
@@ -282,7 +292,8 @@ namespace Discord
             var minimum = SnowflakeUtils.ToSnowflake(DateTimeOffset.UtcNow.Subtract(TimeSpan.FromDays(14)));
             for (var i = 0; i < collection.Length; i++)
             {
-                if (collection[i] == 0) continue;
+                if (collection[i] == 0)
+                    continue;
                 if (collection[i] <= minimum)
                     throw new ArgumentOutOfRangeException(name, "Messages must be younger than two weeks old.");
             }

src/Discord.Net.Rest/API/Common/AuditLogChange.cs

@@ -1,4 +1,4 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
 namespace Discord.API

src/Discord.Net.Rest/API/Common/AuditLogOptions.cs

@@ -1,4 +1,4 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Discord.API
 {

src/Discord.Net.Rest/API/Common/Embed.cs

@@ -1,6 +1,6 @@
-using System;
-using Newtonsoft.Json;
 using Discord.Net.Converters;
+using Newtonsoft.Json;
+using System;
 
 namespace Discord.API
 {

src/Discord.Net.Rest/API/Common/EmbedField.cs

@@ -1,4 +1,4 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Discord.API
 {

src/Discord.Net.Rest/API/Common/GameSecrets.cs

@@ -1,4 +1,4 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Discord.API
 {

src/Discord.Net.Rest/API/Common/GameTimestamps.cs

@@ -1,5 +1,5 @@
-using System;
 using Newtonsoft.Json;
+using System;
 
 namespace Discord.API
 {

src/Discord.Net.Rest/API/Common/Reaction.cs

@@ -1,4 +1,4 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Discord.API
 {

src/Discord.Net.Rest/API/EntityOrId.cs

@@ -1,4 +1,4 @@
-namespace Discord.API
+namespace Discord.API
 {
     internal struct EntityOrId<T>
     {

src/Discord.Net.Rest/API/Image.cs

@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 
 namespace Discord.API
 {

src/Discord.Net.Rest/API/Rest/UploadWebhookFileParams.cs

@@ -1,9 +1,9 @@
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
 using Discord.Net.Converters;
 using Discord.Net.Rest;
 using Newtonsoft.Json;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
 
 namespace Discord.API.Rest
 {

src/Discord.Net.Rest/API/UnixTimestampAttribute.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace Discord.API
 {

src/Discord.Net.Rest/BaseDiscordClient.cs

@@ -126,7 +126,8 @@ namespace Discord.Rest
         }
         internal virtual async Task LogoutInternalAsync()
         {
-            if (LoginState == LoginState.LoggedOut) return;
+            if (LoginState == LoginState.LoggedOut)
+                return;
             LoginState = LoginState.LoggingOut;
 
             await ApiClient.LogoutAsync().ConfigureAwait(false);

src/Discord.Net.Rest/ClientHelper.cs

@@ -1,5 +1,5 @@
-using System;
 using Discord.API.Rest;
+using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.IO;

src/Discord.Net.Rest/Entities/AuditLogs/AuditLogHelper.cs

@@ -1,8 +1,7 @@
 using System;
 using System.Collections.Generic;
-
-using Model = Discord.API.AuditLog;
 using EntryModel = Discord.API.AuditLogEntry;
+using Model = Discord.API.AuditLog;
 
 namespace Discord.Rest
 {

src/Discord.Net.Rest/Entities/AuditLogs/DataTypes/BanAuditLogData.cs

@@ -1,7 +1,6 @@
 using System.Linq;
-
-using Model = Discord.API.AuditLog;
 using EntryModel = Discord.API.AuditLogEntry;
+using Model = Discord.API.AuditLog;
 
 namespace Discord.Rest
 {

src/Discord.Net.Rest/Entities/AuditLogs/DataTypes/BotAddAuditLogData.cs

@@ -1,7 +1,6 @@
 using System.Linq;
-
-using Model = Discord.API.AuditLog;
 using EntryModel = Discord.API.AuditLogEntry;
+using Model = Discord.API.AuditLog;
 
 namespace Discord.Rest
 {

src/Discord.Net.Rest/Entities/AuditLogs/DataTypes/ChannelCreateAuditLogData.cs

@@ -1,8 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
-
-using Model = Discord.API.AuditLog;
 using EntryModel = Discord.API.AuditLogEntry;
+using Model = Discord.API.AuditLog;
 
 namespace Discord.Rest
 {

src/Discord.Net.Rest/Entities/AuditLogs/DataTypes/ChannelDeleteAuditLogData.cs

@@ -1,8 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
-
-using Model = Discord.API.AuditLog;
 using EntryModel = Discord.API.AuditLogEntry;
+using Model = Discord.API.AuditLog;
 
 namespace Discord.Rest
 {

src/Discord.Net.Rest/Entities/AuditLogs/DataTypes/ChannelUpdateAuditLogData.cs

@@ -1,7 +1,6 @@
 using System.Linq;
-
-using Model = Discord.API.AuditLog;
 using EntryModel = Discord.API.AuditLogEntry;
+using Model = Discord.API.AuditLog;
 
 namespace Discord.Rest
 {

src/Discord.Net.Rest/Entities/AuditLogs/DataTypes/EmoteCreateAuditLogData.cs

@@ -1,7 +1,6 @@
 using System.Linq;
-
-using Model = Discord.API.AuditLog;
 using EntryModel = Discord.API.AuditLogEntry;
+using Model = Discord.API.AuditLog;
 
 namespace Discord.Rest
 {

src/Discord.Net.Rest/Entities/AuditLogs/DataTypes/EmoteDeleteAuditLogData.cs

@@ -1,7 +1,6 @@
 using System.Linq;
-
-using Model = Discord.API.AuditLog;
 using EntryModel = Discord.API.AuditLogEntry;
+using Model = Discord.API.AuditLog;
 
 namespace Discord.Rest
 {

src/Discord.Net.Rest/Entities/AuditLogs/DataTypes/EmoteUpdateAuditLogData.cs

@@ -1,7 +1,6 @@
 using System.Linq;
-
-using Model = Discord.API.AuditLog;
 using EntryModel = Discord.API.AuditLogEntry;
+using Model = Discord.API.AuditLog;
 
 namespace Discord.Rest
 {

src/Discord.Net.Rest/Entities/AuditLogs/DataTypes/GuildUpdateAuditLogData.cs

@@ -1,7 +1,6 @@
 using System.Linq;
-
-using Model = Discord.API.AuditLog;
 using EntryModel = Discord.API.AuditLogEntry;
+using Model = Discord.API.AuditLog;
 
 namespace Discord.Rest
 {

src/Discord.Net.Rest/Entities/AuditLogs/DataTypes/InviteCreateAuditLogData.cs

@@ -1,7 +1,6 @@
 using System.Linq;
-
-using Model = Discord.API.AuditLog;
 using EntryModel = Discord.API.AuditLogEntry;
+using Model = Discord.API.AuditLog;
 
 namespace Discord.Rest
 {

src/Discord.Net.Rest/Entities/AuditLogs/DataTypes/InviteDeleteAuditLogData.cs

@@ -1,7 +1,6 @@
 using System.Linq;
-
-using Model = Discord.API.AuditLog;
 using EntryModel = Discord.API.AuditLogEntry;
+using Model = Discord.API.AuditLog;
 
 namespace Discord.Rest
 {

src/Discord.Net.Rest/Entities/AuditLogs/DataTypes/InviteUpdateAuditLogData.cs

@@ -1,7 +1,6 @@
 using System.Linq;
-
-using Model = Discord.API.AuditLog;
 using EntryModel = Discord.API.AuditLogEntry;
+using Model = Discord.API.AuditLog;
 
 namespace Discord.Rest
 {

src/Discord.Net.Rest/Entities/AuditLogs/DataTypes/KickAuditLogData.cs

@@ -1,7 +1,6 @@
 using System.Linq;
-
-using Model = Discord.API.AuditLog;
 using EntryModel = Discord.API.AuditLogEntry;
+using Model = Discord.API.AuditLog;
 
 namespace Discord.Rest
 {

src/Discord.Net.Rest/Entities/AuditLogs/DataTypes/MemberDisconnectAuditLogData.cs

@@ -1,5 +1,5 @@
-using Model = Discord.API.AuditLog;
 using EntryModel = Discord.API.AuditLogEntry;
+using Model = Discord.API.AuditLog;
 
 namespace Discord.Rest
 {

src/Discord.Net.Rest/Entities/AuditLogs/DataTypes/MemberMoveAuditLogData.cs

@@ -1,5 +1,5 @@
-using Model = Discord.API.AuditLog;
 using EntryModel = Discord.API.AuditLogEntry;
+using Model = Discord.API.AuditLog;
 
 namespace Discord.Rest
 {

src/Discord.Net.Rest/Entities/AuditLogs/DataTypes/MemberRoleAuditLogData.cs

@@ -1,8 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
-
-using Model = Discord.API.AuditLog;
 using EntryModel = Discord.API.AuditLogEntry;
+using Model = Discord.API.AuditLog;
 
 namespace Discord.Rest
 {

src/Discord.Net.Rest/Entities/AuditLogs/DataTypes/MemberUpdateAuditLogData.cs

@@ -1,7 +1,6 @@
 using System.Linq;
-
-using Model = Discord.API.AuditLog;
 using EntryModel = Discord.API.AuditLogEntry;
+using Model = Discord.API.AuditLog;
 
 namespace Discord.Rest
 {

src/Discord.Net.Rest/Entities/AuditLogs/DataTypes/MessageBulkDeleteAuditLogData.cs

@@ -1,5 +1,5 @@
-using Model = Discord.API.AuditLog;
 using EntryModel = Discord.API.AuditLogEntry;
+using Model = Discord.API.AuditLog;
 
 namespace Discord.Rest
 {

src/Discord.Net.Rest/Entities/AuditLogs/DataTypes/MessageDeleteAuditLogData.cs

@@ -1,8 +1,7 @@
-using System.Linq;
-
-using Model = Discord.API.AuditLog;
-using EntryModel = Discord.API.AuditLogEntry;
 using System;
+using System.Linq;
+using EntryModel = Discord.API.AuditLogEntry;
+using Model = Discord.API.AuditLog;
 
 namespace Discord.Rest
 {

src/Discord.Net.Rest/Entities/AuditLogs/DataTypes/MessagePinAuditLogData.cs

@@ -1,7 +1,6 @@
 using System.Linq;
-
-using Model = Discord.API.AuditLog;
 using EntryModel = Discord.API.AuditLogEntry;
+using Model = Discord.API.AuditLog;
 
 namespace Discord.Rest
 {

src/Discord.Net.Rest/Entities/AuditLogs/DataTypes/MessageUnpinAuditLogData.cs

@@ -1,7 +1,6 @@
 using System.Linq;
-
-using Model = Discord.API.AuditLog;
 using EntryModel = Discord.API.AuditLogEntry;
+using Model = Discord.API.AuditLog;
 
 namespace Discord.Rest
 {

src/Discord.Net.Rest/Entities/AuditLogs/DataTypes/OverwriteCreateAuditLogData.cs

@@ -1,7 +1,6 @@
-using System.Linq;
+using System.Linq;
-
-using Model = Discord.API.AuditLog;
 using EntryModel = Discord.API.AuditLogEntry;
+using Model = Discord.API.AuditLog;
 
 namespace Discord.Rest
 {

src/Discord.Net.Rest/Entities/AuditLogs/DataTypes/OverwriteDeleteAuditLogData.cs

@@ -1,7 +1,6 @@
 using System.Linq;
-
-using Model = Discord.API.AuditLog;
 using EntryModel = Discord.API.AuditLogEntry;
+using Model = Discord.API.AuditLog;
 
 namespace Discord.Rest
 {

src/Discord.Net.Rest/Entities/AuditLogs/DataTypes/OverwriteUpdateAuditLogData.cs

@@ -1,7 +1,6 @@
-using System.Linq;
+using System.Linq;
-
-using Model = Discord.API.AuditLog;
 using EntryModel = Discord.API.AuditLogEntry;
+using Model = Discord.API.AuditLog;
 
 namespace Discord.Rest
 {

src/Discord.Net.Rest/Entities/AuditLogs/DataTypes/PruneAuditLogData.cs

@@ -1,5 +1,5 @@
-using Model = Discord.API.AuditLog;
 using EntryModel = Discord.API.AuditLogEntry;
+using Model = Discord.API.AuditLog;
 
 namespace Discord.Rest
 {

src/Discord.Net.Rest/Entities/AuditLogs/DataTypes/RoleCreateAuditLogData.cs

@@ -1,7 +1,6 @@
-using System.Linq;
+using System.Linq;
-
-using Model = Discord.API.AuditLog;
 using EntryModel = Discord.API.AuditLogEntry;
+using Model = Discord.API.AuditLog;
 
 namespace Discord.Rest
 {

src/Discord.Net.Rest/Entities/AuditLogs/DataTypes/RoleDeleteAuditLogData.cs

@@ -1,7 +1,6 @@
-using System.Linq;
+using System.Linq;
-
-using Model = Discord.API.AuditLog;
 using EntryModel = Discord.API.AuditLogEntry;
+using Model = Discord.API.AuditLog;
 
 namespace Discord.Rest
 {

src/Discord.Net.Rest/Entities/AuditLogs/DataTypes/RoleUpdateAuditLogData.cs

@@ -1,7 +1,6 @@
-using System.Linq;
+using System.Linq;
-
-using Model = Discord.API.AuditLog;
 using EntryModel = Discord.API.AuditLogEntry;
+using Model = Discord.API.AuditLog;
 
 namespace Discord.Rest
 {

src/Discord.Net.Rest/Entities/AuditLogs/DataTypes/ScheduledEventCreateAuditLogData.cs

@@ -1,9 +1,8 @@
+using Discord.API;
 using System;
 using System.Linq;
-using Discord.API;
-
-using Model = Discord.API.AuditLog;
 using EntryModel = Discord.API.AuditLogEntry;
+using Model = Discord.API.AuditLog;
 
 namespace Discord.Rest
 {

src/Discord.Net.Rest/Entities/AuditLogs/DataTypes/ScheduledEventDeleteAuditLogData.cs

@@ -1,9 +1,8 @@
+using Discord.API;
 using System;
 using System.Linq;
-using Discord.API;
-
-using Model = Discord.API.AuditLog;
 using EntryModel = Discord.API.AuditLogEntry;
+using Model = Discord.API.AuditLog;
 
 namespace Discord.Rest
 {

src/Discord.Net.Rest/Entities/AuditLogs/DataTypes/ScheduledEventUpdateAuditLogData.cs

@@ -1,8 +1,7 @@
 using System;
 using System.Linq;
-
-using Model = Discord.API.AuditLog;
 using EntryModel = Discord.API.AuditLogEntry;
+using Model = Discord.API.AuditLog;
 
 namespace Discord.Rest
 {

src/Discord.Net.Rest/Entities/AuditLogs/DataTypes/StageInstanceCreateAuditLogData.cs

@@ -1,6 +1,6 @@
 using System.Linq;
-using Model = Discord.API.AuditLog;
 using EntryModel = Discord.API.AuditLogEntry;
+using Model = Discord.API.AuditLog;
 
 namespace Discord.Rest
 {

src/Discord.Net.Rest/Entities/AuditLogs/DataTypes/StageInstanceDeleteAuditLogData.cs

@@ -1,6 +1,6 @@
 using System.Linq;
-using Model = Discord.API.AuditLog;
 using EntryModel = Discord.API.AuditLogEntry;
+using Model = Discord.API.AuditLog;
 
 namespace Discord.Rest
 {

src/Discord.Net.Rest/Entities/AuditLogs/DataTypes/StageInstanceUpdatedAuditLogData.cs

@@ -1,6 +1,6 @@
 using System.Linq;
-using Model = Discord.API.AuditLog;
 using EntryModel = Discord.API.AuditLogEntry;
+using Model = Discord.API.AuditLog;
 
 namespace Discord.Rest
 {

src/Discord.Net.Rest/Entities/AuditLogs/DataTypes/ThreadCreateAuditLogData.cs

@@ -1,7 +1,6 @@
 using System.Linq;
-
-using Model = Discord.API.AuditLog;
 using EntryModel = Discord.API.AuditLogEntry;
+using Model = Discord.API.AuditLog;
 
 namespace Discord.Rest
 {

src/Discord.Net.Rest/Entities/AuditLogs/DataTypes/ThreadDeleteAuditLogData.cs

@@ -1,7 +1,6 @@
 using System.Linq;
-
-using Model = Discord.API.AuditLog;
 using EntryModel = Discord.API.AuditLogEntry;
+using Model = Discord.API.AuditLog;
 
 namespace Discord.Rest
 {

src/Discord.Net.Rest/Entities/AuditLogs/DataTypes/ThreadUpdateAuditLogData.cs

@@ -1,7 +1,6 @@
 using System.Linq;
-
-using Model = Discord.API.AuditLog;
 using EntryModel = Discord.API.AuditLogEntry;
+using Model = Discord.API.AuditLog;
 
 namespace Discord.Rest
 {

src/Discord.Net.Rest/Entities/AuditLogs/DataTypes/UnbanAuditLogData.cs

@@ -1,7 +1,6 @@
 using System.Linq;
-
-using Model = Discord.API.AuditLog;
 using EntryModel = Discord.API.AuditLogEntry;
+using Model = Discord.API.AuditLog;
 
 namespace Discord.Rest
 {

src/Discord.Net.Rest/Entities/AuditLogs/DataTypes/WebhookCreateAuditLogData.cs

@@ -1,7 +1,6 @@
-using System.Linq;
+using System.Linq;
-
-using Model = Discord.API.AuditLog;
 using EntryModel = Discord.API.AuditLogEntry;
+using Model = Discord.API.AuditLog;
 
 namespace Discord.Rest
 {

src/Discord.Net.Rest/Entities/AuditLogs/DataTypes/WebhookDeleteAuditLogData.cs

@@ -1,7 +1,6 @@
 using System.Linq;
-
-using Model = Discord.API.AuditLog;
 using EntryModel = Discord.API.AuditLogEntry;
+using Model = Discord.API.AuditLog;
 
 namespace Discord.Rest
 {

src/Discord.Net.Rest/Entities/AuditLogs/DataTypes/WebhookUpdateAuditLogData.cs

@@ -1,7 +1,6 @@
 using System.Linq;
-
-using Model = Discord.API.AuditLog;
 using EntryModel = Discord.API.AuditLogEntry;
+using Model = Discord.API.AuditLog;
 
 namespace Discord.Rest
 {

src/Discord.Net.Rest/Entities/AuditLogs/RestAuditLogEntry.cs

@@ -1,8 +1,7 @@
 using System;
 using System.Linq;
-
-using Model = Discord.API.AuditLog;
 using EntryModel = Discord.API.AuditLogEntry;
+using Model = Discord.API.AuditLog;
 
 namespace Discord.Rest
 {

src/Discord.Net.Rest/Entities/Channels/IRestAudioChannel.cs

@@ -1,4 +1,4 @@
-namespace Discord.Rest
+namespace Discord.Rest
 {
     public interface IRestAudioChannel : IAudioChannel
     {

src/Discord.Net.Rest/Entities/Guilds/GuildHelper.cs

@@ -3,13 +3,13 @@ using Discord.API.Rest;
 using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
+using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
-using WidgetModel = Discord.API.GuildWidget;
+using ImageModel = Discord.API.Image;
 using Model = Discord.API.Guild;
 using RoleModel = Discord.API.Role;
-using ImageModel = Discord.API.Image;
+using WidgetModel = Discord.API.GuildWidget;
-using System.IO;
 
 namespace Discord.Rest
 {

src/Discord.Net.Rest/Entities/Guilds/RestGuild.cs

@@ -4,11 +4,11 @@ using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Diagnostics;
 using System.Globalization;
+using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
-using WidgetModel = Discord.API.GuildWidget;
 using Model = Discord.API.Guild;
-using System.IO;
+using WidgetModel = Discord.API.GuildWidget;
 
 namespace Discord.Rest
 {

src/Discord.Net.Rest/Entities/Interactions/MessageComponents/RestMessageComponent.cs

@@ -1,12 +1,12 @@
+using Discord.Net.Rest;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Model = Discord.API.Interaction;
 using DataModel = Discord.API.MessageComponentInteractionData;
-using System.IO;
+using Model = Discord.API.Interaction;
-using Discord.Net.Rest;
 
 namespace Discord.Rest
 {

src/Discord.Net.Rest/Entities/Interactions/Modals/RestModalData.cs

@@ -1,9 +1,9 @@
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using System;
-using Model = Discord.API.ModalInteractionData;
-using InterationModel = Discord.API.Interaction;
 using DataModel = Discord.API.MessageComponentInteractionData;
+using InterationModel = Discord.API.Interaction;
+using Model = Discord.API.ModalInteractionData;
 
 namespace Discord.Rest
 {

src/Discord.Net.Rest/Entities/Interactions/RestInteraction.cs

@@ -1,12 +1,12 @@
+using Discord.Net;
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
 using System.Threading.Tasks;
-using Model = Discord.API.Interaction;
 using DataModel = Discord.API.ApplicationCommandInteractionData;
-using Newtonsoft.Json;
+using Model = Discord.API.Interaction;
-using Discord.Net;
 
 namespace Discord.Rest
 {

src/Discord.Net.Rest/Entities/Interactions/SlashCommands/RestAutocompleteInteraction.cs

@@ -1,11 +1,11 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Model = Discord.API.Interaction;
 using DataModel = Discord.API.AutocompleteInteractionData;
-using System.IO;
+using Model = Discord.API.Interaction;
 
 namespace Discord.Rest
 {