modernise code

Author: Angel-foxxo

Arrays.cs

@@ -10,16 +10,12 @@ namespace Datamodel
     [DebuggerDisplay("Count = {Inner.Count}")]
     public abstract class Array<T> : IList<T>, IList
     {
-        internal class DebugView
+        internal class DebugView(Array<T> arr)
         {
-            public DebugView(Array<T> arr)
-            {
-                Arr = arr;
-            }
-            Array<T> Arr;
+            readonly Array<T> Arr = arr;
 
             [DebuggerBrowsable(DebuggerBrowsableState.RootHidden)]
-            public T[] Items { get { return Arr.Inner.ToArray(); } }
+            public T[] Items { get { return [.. Arr.Inner]; } }
         }
 
         protected List<T> Inner;
@@ -38,15 +34,15 @@ internal set
 
         internal Array()
         {
-            Inner = new List<T>();
+            Inner = [];
         }
 
         internal Array(IEnumerable<T> enumerable)
         {
             if (enumerable != null)
-                Inner = new List<T>(enumerable);
+                Inner = [.. enumerable];
             else
-                Inner = new List<T>();
+                Inner = [];
         }
 
         internal Array(int capacity)

AttributeList.cs

@@ -100,7 +100,7 @@ public AttributeList(Datamodel? owner)
                 }
             }
 
-            Inner = new OrderedDictionary();
+            Inner = [];
             Owner = owner;
         }
 

Codecs/Binary.cs

@@ -18,7 +18,7 @@ namespace Datamodel.Codecs
     [CodecFormat("binary", 9)]
     class Binary : ICodec
     {
-        static readonly Dictionary<int, Type?[]> SupportedAttributes = new();
+        static readonly Dictionary<int, Type?[]> SupportedAttributes = [];
 
         /// <summary>
         /// The number of Datamodel binary ticks in one second. Used to store TimeSpan values.
@@ -28,21 +28,21 @@ class Binary : ICodec
         static Binary()
         {
             SupportedAttributes[1] =
-            SupportedAttributes[2] = new Type?[] {
+            SupportedAttributes[2] = [
                 typeof(Element), typeof(int), typeof(float), typeof(bool), typeof(string), typeof(byte[]),
                 null /* ObjectID */, typeof(Color), typeof(Vector2), typeof(Vector3), typeof(Vector4), typeof(Vector3) /* angle*/, typeof(Quaternion), typeof(Matrix4x4)
-            };
+            ];
             SupportedAttributes[3] =
             SupportedAttributes[4] =
-            SupportedAttributes[5] = new Type[] {
+            SupportedAttributes[5] = [
                 typeof(Element), typeof(int), typeof(float), typeof(bool), typeof(string), typeof(byte[]),
                 typeof(TimeSpan), typeof(Color), typeof(Vector2), typeof(Vector3), typeof(Vector4), typeof(Vector3) /* angle*/, typeof(Quaternion), typeof(Matrix4x4)
-            };
-            SupportedAttributes[9] = new Type[] {
+            ];
+            SupportedAttributes[9] = [
                 typeof(Element), typeof(int), typeof(float), typeof(bool), typeof(string), typeof(byte[]),
                 typeof(TimeSpan), typeof(Color), typeof(Vector2), typeof(Vector3), typeof(Vector4), typeof(QAngle), typeof(Quaternion), typeof(Matrix4x4),
                 typeof(ulong), typeof(byte)
-            };
+            ];
         }
 
         static byte TypeToId(Type type, int version)
@@ -105,7 +105,7 @@ static byte TypeToId(Type type, int version)
 
         protected string ReadString_Raw(BinaryReader reader)
         {
-            List<byte> raw = new();
+            List<byte> raw = [];
             while (true)
             {
                 byte cur = reader.ReadByte();
@@ -124,7 +124,7 @@ class StringDictionary
             readonly Binary? Codec;
             readonly int EncodingVersion;
 
-            readonly List<string> Strings = new();
+            readonly List<string> Strings = [];
             public bool Dummy;
 
             // binary 4 uses int for dictionary length, but short for dictionary indices. Whoops!
@@ -156,14 +156,14 @@ public StringDictionary(int encoding_version, BinaryWriter writer, Datamodel dm)
                 Dummy = EncodingVersion == 1;
                 if (!Dummy)
                 {
-                    Scraped = new HashSet<Element>();
+                    Scraped = [];
 
                     ScrapeElement(dm.Root);
                     Strings = Strings.Distinct().ToList();
                 }
             }
 
-            private readonly HashSet<Element> Scraped = new();
+            private readonly HashSet<Element> Scraped = [];
 
             void ScrapeElement(Element? elem)
             {
@@ -389,7 +389,7 @@ public Datamodel Decode(string encoding, int encoding_version, string format, in
                         ConstructorInfo? constructor = typeof(Element).GetConstructor(
                             BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic,
                             null,
-                            new Type[] { typeof(Datamodel), typeof(string), typeof(Guid), typeof(string) },
+                            [typeof(Datamodel), typeof(string), typeof(Guid), typeof(string)],
                             null
                         );
 
@@ -399,7 +399,7 @@ public Datamodel Decode(string encoding, int encoding_version, string format, in
                         }
 
                         object uninitializedObject = RuntimeHelpers.GetUninitializedObject(derivedType);
-                        constructor.Invoke(uninitializedObject, new object[] { dm, name, id, type });
+                        constructor.Invoke(uninitializedObject, [dm, name, id, type]);
 
                         elem = (Element?)uninitializedObject;
                     }
@@ -548,8 +548,8 @@ public Encoder(BinaryWriter writer, Datamodel dm, int version)
                 Datamodel = dm;
 
                 StringDict = new StringDictionary(version, writer, dm);
-                ElementIndices = new Dictionary<Element, int>();
-                ElementOrder = new List<Element>();
+                ElementIndices = [];
+                ElementOrder = [];
 
             }
 

Codecs/KeyValues2.cs

@@ -22,8 +22,8 @@ namespace Datamodel.Codecs
     [CodecFormat("keyvalues2_noids", 4)]
     class KeyValues2 : ICodec
     {
-        static readonly Dictionary<Type, string> TypeNames = new();
-        static readonly Dictionary<int, Type[]> ValidAttributes = new();
+        static readonly Dictionary<Type, string> TypeNames = [];
+        static readonly Dictionary<int, Type[]> ValidAttributes = [];
         static KeyValues2()
         {
             TypeNames[typeof(Element)] = "element";
@@ -131,7 +131,7 @@ public void Flush()
 
         // Multi-referenced elements are written out as a separate block at the end of the file.
         // In-line only the id is written.
-        Dictionary<Element, int> ReferenceCount = new();
+        Dictionary<Element, int> ReferenceCount = [];
 
         bool SupportsReferenceIds;
 
@@ -294,9 +294,8 @@ void WriteAttribute(string name, int encodingVersion, Type type, object value, b
 
                     value = FormattableString.Invariant(FormattableStringFactory.Create(matrixString));
                 }
-                else if (value is QAngle qangle_value)
+                else if (value is QAngle castValue)
                 {
-                    var castValue = (QAngle)value;
                     value = FormattableString.Invariant($"{castValue.Pitch} {castValue.Yaw} {castValue.Roll}");
                 }
 
@@ -354,7 +353,7 @@ public void Encode(Datamodel dm, string encoding, int encodingVersion, Stream st
             writer.Write(String.Format(CodecUtilities.HeaderPattern, encoding, encodingVersion, dm.Format, dm.FormatVersion));
             writer.WriteLine();
 
-            ReferenceCount = new Dictionary<Element, int>();
+            ReferenceCount = [];
 
             if (encodingVersion >= 4 && dm.PrefixAttributes.Count > 0)
             {
@@ -404,8 +403,8 @@ private class IntermediateData
             // these store element refs while we process the elements, once were done
             // we can go trough these and actually create the attributes
             // and add the elements to lists
-            public Dictionary<Element, List<(string, Guid)>> PropertiesToAdd = new();
-            public Dictionary<IList, List<Guid>> ListRefs = new();
+            public Dictionary<Element, List<(string, Guid)>> PropertiesToAdd = [];
+            public Dictionary<IList, List<Guid>> ListRefs = [];
 
             public void HandleElementProp(Element? element, string attrName, Guid id)
             {
@@ -418,7 +417,7 @@ public void HandleElementProp(Element? element, string attrName, Guid id)
 
                 if (attrList == null)
                 {
-                    attrList = new List<(string, Guid)>();
+                    attrList = [];
                     PropertiesToAdd.Add(element, attrList);
                 }
 
@@ -432,7 +431,7 @@ public void HandleListRefs(IList list, Guid id)
 
                 if (guidList == null)
                 {
-                    guidList = new List<Guid>();
+                    guidList = [];
                     ListRefs.Add(list, guidList);
                 }
 
@@ -522,7 +521,7 @@ string Decode_NextToken(StreamReader reader)
                                 ConstructorInfo? constructor = typeof(Element).GetConstructor(
                                     BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic,
                                     null,
-                                    new Type[] { typeof(Datamodel), typeof(string), typeof(Guid), typeof(string) },
+                                    [typeof(Datamodel), typeof(string), typeof(Guid), typeof(string)],
                                     null
                                 );
 
@@ -532,16 +531,13 @@ string Decode_NextToken(StreamReader reader)
                                 }
 
                                 object uninitializedObject = RuntimeHelpers.GetUninitializedObject(derivedType);
-                                constructor.Invoke(uninitializedObject, new object[] { dataModel, elem_name, new Guid(elem_id), elem_class });
+                                constructor.Invoke(uninitializedObject, [dataModel, elem_name, new Guid(elem_id), elem_class]);
 
                                 elem = (Element?)uninitializedObject;
                             }
                         }
 
-                        if (elem == null)
-                        {
-                            elem = new Element(dataModel, elem_name, new Guid(elem_id), elem_class);
-                        }
+                        elem ??= new Element(dataModel, elem_name, new Guid(elem_id), elem_class);
                     }
 
                     continue;
@@ -664,7 +660,7 @@ string Decode_NextToken(StreamReader reader)
             else if (type == typeof(TimeSpan))
                 return TimeSpan.FromTicks((long)(double.Parse(value, CultureInfo.InvariantCulture) * TimeSpan.TicksPerSecond));
 
-            var num_list = value.Split((char[]?)null, StringSplitOptions.RemoveEmptyEntries);
+            var num_list = value.Split(Array.Empty<char>(), StringSplitOptions.RemoveEmptyEntries);
 
             if (type == typeof(Color))
             {

Datamodel.ElementList.cs

@@ -32,7 +32,7 @@ public DebugView(ElementList item)
                 public Element[] Elements => Item.store.Values.Cast<Element>().ToArray();
             }
 
-            private readonly OrderedDictionary store = new();
+            private readonly OrderedDictionary store = [];
             private readonly Datamodel Owner;
 
             internal ElementList(Datamodel owner)

Datamodel.cs

@@ -36,7 +36,7 @@ public DebugView(Datamodel dm)
 
         #region Attribute types
 
-        private static readonly Type[] attributeTypes = {
+        private static readonly Type[] attributeTypes = [
             typeof(Element),
             typeof(int),
             typeof(float),
@@ -53,7 +53,7 @@ public DebugView(Datamodel dm)
             typeof(byte),
             typeof(ulong),
             typeof(QAngle),
-        };
+        ];
 
         public static Type[] AttributeTypes => attributeTypes;
 
@@ -110,7 +110,7 @@ static Datamodel()
         }
 
         #region Codecs
-        public static readonly Dictionary<CodecRegistration, Type> Codecs = new();
+        public static readonly Dictionary<CodecRegistration, Type> Codecs = [];
 
         public static IEnumerable<CodecRegistration> CodecsRegistered => Codecs.Keys.OrderBy(reg => string.Join(null, reg.Item1, reg.Item2)).ToArray();
 
@@ -606,7 +606,7 @@ public ImportJob(ImportRecursionMode import_mode, ImportOverwriteMode overwrite_
             {
                 ImportMode = import_mode;
                 OverwriteMode = overwrite_mode;
-                ImportMap = new Dictionary<Element, Element>();
+                ImportMap = [];
             }
         }
 

Element.cs

@@ -403,11 +403,11 @@ public static bool IsElementDerived(Type type)
                 }
                 else
                 {
-                    return type == elementType ? true : false;
+                    return type == elementType;
                 }
             }
 
-            return type.BaseType == elementType ? true : false;
+            return type.BaseType == elementType;
         }
     }
 

ICodec.cs

@@ -38,21 +38,14 @@ public interface ICodec
     /// Parameters for reflection based deserialisation
     /// By default it will look for types in the calling assembly (the one which made this class)
     /// </summary>
-    public class ReflectionParams
+    /// <param name="attemptReflection">If to use reflection or not.</param>
+    /// <param name="additionalTypes">Additional types to consider when matching.</param>
+    /// <param name="assembliesToSearch">Additional assemblies to look for types in.</param>
+    public class ReflectionParams(bool attemptReflection = true, List<Type>? additionalTypes = null, List<Assembly>? assembliesToSearch = null)
     {
-        public bool AttemptReflection;
-        public List<Type> AdditionalTypes;
-        public List<Assembly> AssembliesToSearch;
-
-        /// <param name="attemptReflection">If to use reflection or not.</param>
-        /// <param name="additionalTypes">Additional types to consider when matching.</param>
-        /// <param name="assembliesToSearch">Additional assemblies to look for types in.</param>
-        public ReflectionParams(bool attemptReflection = true, List<Type>? additionalTypes = null, List<Assembly>? assembliesToSearch = null)
-        {
-            AttemptReflection = attemptReflection;
-            AdditionalTypes = additionalTypes ??= new();
-            AssembliesToSearch = assembliesToSearch ??= new();
-        }
+        public bool AttemptReflection = attemptReflection;
+        public List<Type> AdditionalTypes = additionalTypes ??= [];
+        public List<Assembly> AssembliesToSearch = assembliesToSearch ??= [];
     }
 
 
@@ -197,7 +190,7 @@ public static void AddDeferredAttribute(Element elem, string key, long offset)
 
         public static Dictionary<string, Type> GetReflectionTypes(ReflectionParams reflectionParams)
         {
-            Dictionary<string, Type> types = new();
+            Dictionary<string, Type> types = [];
 
             if (reflectionParams.AttemptReflection)
             {
@@ -242,7 +235,7 @@ public CodecFormatAttribute(string name, params int[] versions)
         public CodecFormatAttribute(string name, int version)
         {
             Name = name;
-            Versions = new int[] { version };
+            Versions = [version];
         }
 
         public string Name { get; private set; }

Types/Color.cs

@@ -13,5 +13,5 @@ public void ToBytes(Span<byte> bytes)
     }
 
     public byte[] ToBytes()
-        => new byte[] { R, G, B, A };
+        => [R, G, B, A];
 }