Added and applied styles for private readonly fields, private fields to Extensions and Common folders.

- Some renamings and code cleanups
- Chained method calls, binary expressions and binary patterns will now break into newlines
- Type param constraints and base constructor calls will be on the new line

src/NadekoBot/Common/Yml/CommentGatheringTypeInspector.cs

@@ -12,9 +12,7 @@ public class CommentGatheringTypeInspector : TypeInspectorSkeleton
         => this.innerTypeDescriptor = innerTypeDescriptor ?? throw new ArgumentNullException("innerTypeDescriptor");
 
     public override IEnumerable<IPropertyDescriptor> GetProperties(Type type, object container)
-        => innerTypeDescriptor
-            .GetProperties(type, container)
-            .Select(d => new CommentsPropertyDescriptor(d));
+        => innerTypeDescriptor.GetProperties(type, container).Select(d => new CommentsPropertyDescriptor(d));
 
     private sealed class CommentsPropertyDescriptor : IPropertyDescriptor
     {
@@ -31,14 +29,16 @@ public class CommentGatheringTypeInspector : TypeInspectorSkeleton
         public Type Type
             => baseDescriptor.Type;
 
-        public Type TypeOverride {
+        public Type TypeOverride
+        {
             get => baseDescriptor.TypeOverride;
             set => baseDescriptor.TypeOverride = value;
         }
 
         public int Order { get; set; }
 
-        public ScalarStyle ScalarStyle {
+        public ScalarStyle ScalarStyle
+        {
             get => baseDescriptor.ScalarStyle;
             set => baseDescriptor.ScalarStyle = value;
         }
@@ -49,7 +49,8 @@ public class CommentGatheringTypeInspector : TypeInspectorSkeleton
         public void Write(object target, object value)
             => baseDescriptor.Write(target, value);
 
-        public T GetCustomAttribute<T>() where T : Attribute
+        public T GetCustomAttribute<T>()
+            where T : Attribute
             => baseDescriptor.GetCustomAttribute<T>();
 
         public IObjectDescriptor Read(object target)

src/NadekoBot/Common/Yml/CommentsObjectGraphVisitor.cs

@@ -14,8 +14,8 @@ public class CommentsObjectGraphVisitor : ChainedObjectGraphVisitor
 
     public override bool EnterMapping(IPropertyDescriptor key, IObjectDescriptor value, IEmitter context)
     {
-        var commentsDescriptor = value as CommentsObjectDescriptor;
-        if (commentsDescriptor != null && !string.IsNullOrWhiteSpace(commentsDescriptor.Comment))
+        if (value is CommentsObjectDescriptor commentsDescriptor &&
+            !string.IsNullOrWhiteSpace(commentsDescriptor.Comment))
         {
             context.Emit(new Comment(commentsDescriptor.Comment.Replace("\n", "\n# "), false));
         }

src/NadekoBot/Common/Yml/MultilineScalarFlowStyleEmitter.cs

@@ -7,11 +7,12 @@ namespace NadekoBot.Common.Yml;
 public class MultilineScalarFlowStyleEmitter : ChainedEventEmitter
 {
     public MultilineScalarFlowStyleEmitter(IEventEmitter nextEmitter)
-        : base(nextEmitter) { }
+        : base(nextEmitter)
+    {
+    }
 
     public override void Emit(ScalarEventInfo eventInfo, IEmitter emitter)
     {
-
         if (typeof(string).IsAssignableFrom(eventInfo.Source.Type))
         {
             var value = eventInfo.Source.Value as string;
@@ -19,10 +20,7 @@ public class MultilineScalarFlowStyleEmitter : ChainedEventEmitter
             {
                 var isMultiLine = value.IndexOfAny(new char[] { '\r', '\n', '\x85', '\x2028', '\x2029' }) >= 0;
                 if (isMultiLine)
-                    eventInfo = new(eventInfo.Source)
-                    {
-                        Style = ScalarStyle.Literal,
-                    };
+                    eventInfo = new(eventInfo.Source) { Style = ScalarStyle.Literal, };
             }
         }
 

src/NadekoBot/Common/Yml/Rgba32Converter.cs

@@ -21,11 +21,11 @@ public class Rgba32Converter : IYamlTypeConverter
     public void WriteYaml(IEmitter emitter, object value, Type type)
     {
         var color = (Rgba32)value;
-        var val = (uint) ((color.B << 0) | (color.G << 8) | (color.R << 16));
+        var val = (uint)((color.B << 0) | (color.G << 8) | (color.R << 16));
         emitter.Emit(new Scalar(val.ToString("X6").ToLower()));
     }
 }
-    
+
 public class CultureInfoConverter : IYamlTypeConverter
 {
     public bool Accepts(Type type)

src/NadekoBot/Common/Yml/Yaml.cs

@@ -4,22 +4,23 @@ namespace NadekoBot.Common.Yml;
 
 public class Yaml
 {
-    public static ISerializer Serializer => new SerializerBuilder()
-        .WithTypeInspector(inner => new CommentGatheringTypeInspector(inner))
-        .WithEmissionPhaseObjectGraphVisitor(args => new CommentsObjectGraphVisitor(args.InnerVisitor))
-        .WithEventEmitter(args => new MultilineScalarFlowStyleEmitter(args))
-        .WithNamingConvention(YamlDotNet.Serialization.NamingConventions.CamelCaseNamingConvention.Instance)
-        .WithIndentedSequences()
-        .WithTypeConverter(new Rgba32Converter())
-        .WithTypeConverter(new CultureInfoConverter())
-        .WithTypeConverter(new UriConverter())
-        .Build();
+    public static ISerializer Serializer
+        => new SerializerBuilder().WithTypeInspector(inner => new CommentGatheringTypeInspector(inner))
+            .WithEmissionPhaseObjectGraphVisitor(args => new CommentsObjectGraphVisitor(args.InnerVisitor))
+            .WithEventEmitter(args => new MultilineScalarFlowStyleEmitter(args))
+            .WithNamingConvention(YamlDotNet.Serialization.NamingConventions.CamelCaseNamingConvention.Instance)
+            .WithIndentedSequences()
+            .WithTypeConverter(new Rgba32Converter())
+            .WithTypeConverter(new CultureInfoConverter())
+            .WithTypeConverter(new UriConverter())
+            .Build();
 
-    public static IDeserializer Deserializer => new DeserializerBuilder()
-        .WithNamingConvention(YamlDotNet.Serialization.NamingConventions.CamelCaseNamingConvention.Instance)
-        .WithTypeConverter(new Rgba32Converter())
-        .WithTypeConverter(new CultureInfoConverter())
-        .WithTypeConverter(new UriConverter())
-        .IgnoreUnmatchedProperties()
-        .Build();
+    public static IDeserializer Deserializer
+        => new DeserializerBuilder()
+            .WithNamingConvention(YamlDotNet.Serialization.NamingConventions.CamelCaseNamingConvention.Instance)
+            .WithTypeConverter(new Rgba32Converter())
+            .WithTypeConverter(new CultureInfoConverter())
+            .WithTypeConverter(new UriConverter())
+            .IgnoreUnmatchedProperties()
+            .Build();
 }

src/NadekoBot/Common/Yml/YamlHelper.cs

@@ -15,27 +15,28 @@ public class YamlHelper
 
         // Scan the character value.
 
-        foreach(var c in point)
+        foreach (var c in point)
         {
             if (!IsHex(c))
             {
                 return point;
             }
+
             character = (character << 4) + AsHex(c);
         }
 
         // Check the value and write the character.
 
-        if (character is >= 0xD800 and <= 0xDFFF or > 0x10FFFF)
+        if (character is (>= 0xD800 and <= 0xDFFF) or > 0x10FFFF)
         {
             return point;
         }
 
         return char.ConvertFromUtf32(character);
     }
-        
+
     public static bool IsHex(char c)
-        => c is >= '0' and <= '9' or >= 'A' and <= 'F' or >= 'a' and <= 'f';
+        => c is (>= '0' and <= '9') or (>= 'A' and <= 'F') or (>= 'a' and <= 'f');
 
     public static int AsHex(char c)
     {
@@ -43,10 +44,12 @@ public class YamlHelper
         {
             return c - '0';
         }
+
         if (c <= 'F')
         {
             return c - 'A' + 10;
         }
+
         return c - 'a' + 10;
     }
 }