Remove Require helper

xPaw · xPaw · commit 86979e820466 · 2025-08-10T11:16:49.000+03:00
Fixes #112
diff --git a/ValveKeyValue/ValveKeyValue.Console/Program.cs b/ValveKeyValue/ValveKeyValue.Console/Program.cs
@@ -29,7 +29,7 @@ static int Execute(
     var options = new KVSerializerOptions
     {
         HasEscapeSequences = escape,
-        EnableValveNullByteBugBehavior = valve_null_bug 
+        EnableValveNullByteBugBehavior = valve_null_bug
     };
     var serializer = KVSerializer.Create(KVSerializationFormat.KeyValues1Text);
     var root = serializer.Deserialize(stream, options);
diff --git a/ValveKeyValue/ValveKeyValue.Test/Binary/StringTableFromScratchTestCase.cs b/ValveKeyValue/ValveKeyValue.Test/Binary/StringTableFromScratchTestCase.cs
@@ -1,5 +1,3 @@
-using System.Linq;
-
 namespace ValveKeyValue.Test
 {
     class StringTableFromScratchTestCase
diff --git a/ValveKeyValue/ValveKeyValue.Test/KVDateTimeTestCase.cs b/ValveKeyValue/ValveKeyValue.Test/KVDateTimeTestCase.cs
@@ -23,7 +23,7 @@ public void DeserializeDateTimeNotSupported()
 
             serializer.Serialize(ms, obj);
             ms.Seek(0, SeekOrigin.Begin);
-            
+
             Assert.That(
                 () => serializer.Deserialize<SerializedType>(ms),
                 Throws.InstanceOf<NotSupportedException>()
@@ -32,7 +32,7 @@ public void DeserializeDateTimeNotSupported()
 
         class SerializedType
         {
-            public DateTime Value { get;set; }
+            public DateTime Value { get; set; }
         }
     }
 }
diff --git a/ValveKeyValue/ValveKeyValue.Test/KVValueToStringTestCase.cs b/ValveKeyValue/ValveKeyValue.Test/KVValueToStringTestCase.cs
@@ -1,5 +1,4 @@
 using System.Collections;
-using System.Linq;
 
 namespace ValveKeyValue.Test
 {
diff --git a/ValveKeyValue/ValveKeyValue.Test/Text/BaseIncludeNestedTestCase.cs b/ValveKeyValue/ValveKeyValue.Test/Text/BaseIncludeNestedTestCase.cs
@@ -52,7 +52,7 @@ Stream IIncludedFileLoader.OpenFile(string filePath)
                 else
                 {
                     throw new InvalidDataException($"Received an unexpected base or include: {filePath}");
-                }                
+                }
             }
         }
     }
diff --git a/ValveKeyValue/ValveKeyValue.Test/Text/BooleanTestCase.cs b/ValveKeyValue/ValveKeyValue.Test/Text/BooleanTestCase.cs
@@ -31,7 +31,7 @@ public void StronglyTypedDeserialization()
                 Assert.That(data.test3_oob, Is.True, nameof(data.test3_oob));
             });
         }
-        
+
         [Test]
         public void DynamicSerialization()
         {
@@ -49,7 +49,7 @@ public void DynamicSerialization()
 
             Assert.That(text, Is.EqualTo(expected));
         }
-        
+
         [Test]
         public void StronglyTypedSerialization()
         {
diff --git a/ValveKeyValue/ValveKeyValue.Test/Text/IncludeNestedTestCase.cs b/ValveKeyValue/ValveKeyValue.Test/Text/IncludeNestedTestCase.cs
@@ -51,7 +51,7 @@ Stream IIncludedFileLoader.OpenFile(string filePath)
                 else
                 {
                     throw new InvalidDataException($"Received an unexpected base or include: {filePath}");
-                }  
+                }
             }
         }
     }
diff --git a/ValveKeyValue/ValveKeyValue.Test/Text/ObjectDeserializationRecordTestCase.cs b/ValveKeyValue/ValveKeyValue.Test/Text/ObjectDeserializationRecordTestCase.cs
@@ -37,6 +37,6 @@ public void SetUp()
             person = new TReader().Read<Person>("Text.object_person.vdf");
         }
 
-        record Person (string FirstName, string LastName, bool CanFixIt);
+        record Person(string FirstName, string LastName, bool CanFixIt);
     }
 }
diff --git a/ValveKeyValue/ValveKeyValue/Abstraction/KVObjectVisitor.cs b/ValveKeyValue/ValveKeyValue/Abstraction/KVObjectVisitor.cs
@@ -4,7 +4,7 @@ sealed class KVObjectVisitor
     {
         public KVObjectVisitor(IVisitationListener listener)
         {
-            Require.NotNull(listener, nameof(listener));
+            ArgumentNullException.ThrowIfNull(listener);
 
             this.listener = listener;
         }
diff --git a/ValveKeyValue/ValveKeyValue/DefaultObjectReflector.cs b/ValveKeyValue/ValveKeyValue/DefaultObjectReflector.cs
@@ -7,8 +7,8 @@ sealed class DefaultObjectReflector : IObjectReflector
     {
         IEnumerable<IObjectMember> IObjectReflector.GetMembers([DynamicallyAccessedMembers(Trimming.Properties)] Type objectType, object @object)
         {
-            Require.NotNull(objectType, nameof(objectType));
-            Require.NotNull(@object, nameof(@object));
+            ArgumentNullException.ThrowIfNull(objectType);
+            ArgumentNullException.ThrowIfNull(@object);
 
             if (IsValueTupleType(objectType))
             {
diff --git a/ValveKeyValue/ValveKeyValue/Deserialization/KVAppendingObjectBuilder.cs b/ValveKeyValue/ValveKeyValue/Deserialization/KVAppendingObjectBuilder.cs
@@ -4,7 +4,7 @@ sealed class KVAppendingObjectBuilder : KVObjectBuilder
     {
         public KVAppendingObjectBuilder(KVObjectBuilder originalBuilder)
         {
-            Require.NotNull(originalBuilder, nameof(originalBuilder));
+            ArgumentNullException.ThrowIfNull(originalBuilder);
 
             this.originalBuilder = originalBuilder;
         }
diff --git a/ValveKeyValue/ValveKeyValue/Deserialization/KVMergingObjectBuilder.cs b/ValveKeyValue/ValveKeyValue/Deserialization/KVMergingObjectBuilder.cs
@@ -6,7 +6,7 @@ sealed class KVMergingObjectBuilder : KVObjectBuilder
     {
         public KVMergingObjectBuilder(KVObjectBuilder originalBuilder)
         {
-            Require.NotNull(originalBuilder, nameof(originalBuilder));
+            ArgumentNullException.ThrowIfNull(originalBuilder);
 
             this.originalBuilder = originalBuilder;
         }
diff --git a/ValveKeyValue/ValveKeyValue/Deserialization/KVTokenReader.cs b/ValveKeyValue/ValveKeyValue/Deserialization/KVTokenReader.cs
@@ -4,7 +4,7 @@ class KVTokenReader : IDisposable
     {
         public KVTokenReader(TextReader textReader)
         {
-            Require.NotNull(textReader, nameof(textReader));
+            ArgumentNullException.ThrowIfNull(textReader);
 
             this.textReader = textReader;
         }
diff --git a/ValveKeyValue/ValveKeyValue/Deserialization/KeyValues1/KV1BinaryReader.cs b/ValveKeyValue/ValveKeyValue/Deserialization/KeyValues1/KV1BinaryReader.cs
@@ -11,8 +11,8 @@ class KV1BinaryReader : IVisitingReader
 
         public KV1BinaryReader(Stream stream, IVisitationListener listener, StringTable stringTable)
         {
-            Require.NotNull(stream, nameof(stream));
-            Require.NotNull(listener, nameof(listener));
+            ArgumentNullException.ThrowIfNull(stream);
+            ArgumentNullException.ThrowIfNull(listener);
 
             if (!stream.CanSeek)
             {
@@ -34,7 +34,7 @@ public KV1BinaryReader(Stream stream, IVisitationListener listener, StringTable
 
         public void ReadObject()
         {
-            Require.NotDisposed(nameof(KV1TextReader), disposed);
+            ObjectDisposedException.ThrowIf(disposed, this);
 
             DetectMagicHeader();
 
diff --git a/ValveKeyValue/ValveKeyValue/Deserialization/KeyValues1/KV1TextReader.cs b/ValveKeyValue/ValveKeyValue/Deserialization/KeyValues1/KV1TextReader.cs
@@ -7,9 +7,9 @@ sealed class KV1TextReader : IVisitingReader
     {
         public KV1TextReader(TextReader textReader, IParsingVisitationListener listener, KVSerializerOptions options)
         {
-            Require.NotNull(textReader, nameof(textReader));
-            Require.NotNull(listener, nameof(listener));
-            Require.NotNull(options, nameof(options));
+            ArgumentNullException.ThrowIfNull(textReader);
+            ArgumentNullException.ThrowIfNull(listener);
+            ArgumentNullException.ThrowIfNull(options);
 
             this.listener = listener;
             this.options = options;
@@ -29,7 +29,7 @@ public KV1TextReader(TextReader textReader, IParsingVisitationListener listener,
 
         public void ReadObject()
         {
-            Require.NotDisposed(nameof(KV1TextReader), disposed);
+            ObjectDisposedException.ThrowIf(disposed, this);
 
             while (stateMachine.IsInObject)
             {
diff --git a/ValveKeyValue/ValveKeyValue/Deserialization/KeyValues1/KV1TokenReader.cs b/ValveKeyValue/ValveKeyValue/Deserialization/KeyValues1/KV1TokenReader.cs
@@ -14,7 +14,7 @@ class KV1TokenReader : KVTokenReader
 
         public KV1TokenReader(TextReader textReader, KVSerializerOptions options) : base(textReader)
         {
-            Require.NotNull(options, nameof(options));
+            ArgumentNullException.ThrowIfNull(options);
 
             this.options = options;
         }
@@ -24,7 +24,8 @@ public KV1TokenReader(TextReader textReader, KVSerializerOptions options) : base
 
         public KVToken ReadNextToken()
         {
-            Require.NotDisposed(nameof(KV1TokenReader), disposed);
+            ObjectDisposedException.ThrowIf(disposed, this);
+
             SwallowWhitespace();
 
             PreviousTokenStartLine = Line;
diff --git a/ValveKeyValue/ValveKeyValue/FieldMember.cs b/ValveKeyValue/ValveKeyValue/FieldMember.cs
@@ -7,8 +7,8 @@ sealed class FieldMember : IObjectMember
     {
         public FieldMember(FieldInfo fieldInfo, object @object)
         {
-            Require.NotNull(fieldInfo, nameof(fieldInfo));
-            Require.NotNull(@object, nameof(@object));
+            ArgumentNullException.ThrowIfNull(fieldInfo);
+            ArgumentNullException.ThrowIfNull(@object);
 
             this.fieldInfo = fieldInfo;
             this.@object = @object;
diff --git a/ValveKeyValue/ValveKeyValue/HexStringHelper.cs b/ValveKeyValue/ValveKeyValue/HexStringHelper.cs
@@ -7,7 +7,7 @@ internal static class HexStringHelper
     {
         public static byte[] ParseHexStringAsByteArray(string hexadecimalRepresentation)
         {
-            Require.NotNull(hexadecimalRepresentation, nameof(hexadecimalRepresentation));
+            ArgumentNullException.ThrowIfNull(hexadecimalRepresentation);
 
             var data = new byte[hexadecimalRepresentation.Length / 2];
             for (var i = 0; i < data.Length; i++)
diff --git a/ValveKeyValue/ValveKeyValue/KVArrayValue.cs b/ValveKeyValue/ValveKeyValue/KVArrayValue.cs
@@ -36,13 +36,13 @@ public KVValue this[int key]
 
         public void Add(KVValue value)
         {
-            Require.NotNull(value, nameof(value));
+            ArgumentNullException.ThrowIfNull(value);
             children.Add(value);
         }
 
         public void AddRange(IEnumerable<KVValue> values)
         {
-            Require.NotNull(values, nameof(values));
+            ArgumentNullException.ThrowIfNull(values);
             children.AddRange(values);
         }
 
@@ -151,31 +151,31 @@ public override ulong ToUInt64(IFormatProvider provider)
 
         public bool Contains(KVValue item)
         {
-            Require.NotNull(item, nameof(item));
+            ArgumentNullException.ThrowIfNull(item);
             return children.Contains(item);
         }
 
         public void CopyTo(KVValue[] array, int arrayIndex)
         {
-            Require.NotNull(array, nameof(array));
+            ArgumentNullException.ThrowIfNull(array);
             children.CopyTo(array, arrayIndex);
         }
 
         public bool Remove(KVValue item)
         {
-            Require.NotNull(item, nameof(item));
+            ArgumentNullException.ThrowIfNull(item);
             return children.Remove(item);
         }
 
         public int IndexOf(KVValue item)
         {
-            Require.NotNull(item, nameof(item));
+            ArgumentNullException.ThrowIfNull(item);
             return children.IndexOf(item);
         }
 
         public void Insert(int index, KVValue item)
         {
-            Require.NotNull(item, nameof(item));
+            ArgumentNullException.ThrowIfNull(item);
             children.Insert(index, item);
         }
 
diff --git a/ValveKeyValue/ValveKeyValue/KVCollectionValue.cs b/ValveKeyValue/ValveKeyValue/KVCollectionValue.cs
@@ -14,37 +14,30 @@ public KVCollectionValue()
 
         public override KVValueType ValueType => KVValueType.Collection;
 
-        public override KVValue this[string key]
-        {
-            get
-            {
-                Require.NotNull(key, nameof(key));
-                return Get(key)?.Value;
-            }
-        }
+        public override KVValue this[string key] => Get(key)?.Value;
 
         public void Add(KVObject value)
         {
-            Require.NotNull(value, nameof(value));
+            ArgumentNullException.ThrowIfNull(value);
             children.Add(value);
         }
 
         public void AddRange(IEnumerable<KVObject> values)
         {
-            Require.NotNull(values, nameof(values));
+            ArgumentNullException.ThrowIfNull(values);
             children.AddRange(values);
         }
 
         public KVObject Get(string name)
         {
-            Require.NotNull(name, nameof(name));
+            ArgumentNullException.ThrowIfNull(name);
             return children.FirstOrDefault(c => c.Name == name);
         }
 
         public void Set(string name, KVValue value)
         {
-            Require.NotNull(name, nameof(name));
-            Require.NotNull(value, nameof(value));
+            ArgumentNullException.ThrowIfNull(name);
+            ArgumentNullException.ThrowIfNull(value);
 
             children.RemoveAll(kv => kv.Name == name);
             children.Add(new KVObject(name, value));
diff --git a/ValveKeyValue/ValveKeyValue/KVConditionEvaluator.cs b/ValveKeyValue/ValveKeyValue/KVConditionEvaluator.cs
@@ -9,7 +9,7 @@ class KVConditionEvaluator
     {
         public KVConditionEvaluator(ICollection<string> definedVariables)
         {
-            Require.NotNull(definedVariables, nameof(definedVariables));
+            ArgumentNullException.ThrowIfNull(definedVariables);
 
             this.definedVariables = definedVariables;
         }
diff --git a/ValveKeyValue/ValveKeyValue/KVObject.cs b/ValveKeyValue/ValveKeyValue/KVObject.cs
@@ -1,6 +1,5 @@
 using System.Diagnostics;
 using System.Linq;
-using System.Text;
 
 namespace ValveKeyValue
 {
@@ -17,8 +16,8 @@ public partial class KVObject
         /// <param name="value">Value of this object.</param>
         public KVObject(string name, KVValue value)
         {
-            Require.NotNull(name, nameof(name));
-            Require.NotNull(value, nameof(value));
+            ArgumentNullException.ThrowIfNull(name);
+            ArgumentNullException.ThrowIfNull(value);
 
             Name = name;
             Value = value;
@@ -31,8 +30,8 @@ public KVObject(string name, KVValue value)
         /// <param name="items">Child items of this object.</param>
         public KVObject(string name, IEnumerable<KVObject> items)
         {
-            Require.NotNull(name, nameof(name));
-            Require.NotNull(items, nameof(items));
+            ArgumentNullException.ThrowIfNull(name);
+            ArgumentNullException.ThrowIfNull(items);
 
             Name = name;
             var value = new KVCollectionValue();
@@ -60,16 +59,12 @@ public KVValue this[string key]
         {
             get
             {
-                Require.NotNull(key, nameof(key));
-
                 var children = GetCollectionValue();
                 return children[key];
             }
 
             set
             {
-                Require.NotNull(key, nameof(key));
-
                 var children = GetCollectionValue();
                 children.Set(key, value);
             }
@@ -81,7 +76,6 @@ public KVValue this[string key]
         /// <param name="value">The child to add.</param>
         public void Add(KVObject value)
         {
-            Require.NotNull(value, nameof(value));
             GetCollectionValue().Add(value);
         }
 
diff --git a/ValveKeyValue/ValveKeyValue/KVObjectValue.cs b/ValveKeyValue/ValveKeyValue/KVObjectValue.cs
@@ -8,10 +8,7 @@ class KVObjectValue<TObject> : KVValue
     {
         public KVObjectValue(TObject value, KVValueType valueType)
         {
-            if (value == null)
-            {
-                throw new ArgumentNullException(nameof(value));
-            }
+            ArgumentNullException.ThrowIfNull(value);
 
             this.value = value;
             ValueType = valueType;
diff --git a/ValveKeyValue/ValveKeyValue/KVPropertyAttribute.cs b/ValveKeyValue/ValveKeyValue/KVPropertyAttribute.cs
@@ -13,7 +13,7 @@ public sealed class KVPropertyAttribute : Attribute
         /// <param name="propertyName">The name of the property as it appears in KeyValues serialized data.</param>
         public KVPropertyAttribute(string propertyName)
         {
-            Require.NotNull(propertyName, nameof(propertyName));
+            ArgumentNullException.ThrowIfNull(propertyName);
             PropertyName = propertyName;
         }
 
diff --git a/ValveKeyValue/ValveKeyValue/KVSerializer.cs b/ValveKeyValue/ValveKeyValue/KVSerializer.cs
diff --git a/ValveKeyValue/ValveKeyValue/KVValue_operators.cs b/ValveKeyValue/ValveKeyValue/KVValue_operators.cs
diff --git a/ValveKeyValue/ValveKeyValue/ObjectCopier.cs b/ValveKeyValue/ValveKeyValue/ObjectCopier.cs
diff --git a/ValveKeyValue/ValveKeyValue/PropertyMember.cs b/ValveKeyValue/ValveKeyValue/PropertyMember.cs
diff --git a/ValveKeyValue/ValveKeyValue/Require.cs b/ValveKeyValue/ValveKeyValue/Require.cs
diff --git a/ValveKeyValue/ValveKeyValue/Serialization/KeyValues1/KV1BinarySerializer.cs b/ValveKeyValue/ValveKeyValue/Serialization/KeyValues1/KV1BinarySerializer.cs
diff --git a/ValveKeyValue/ValveKeyValue/Serialization/KeyValues1/KV1TextSerializer.cs b/ValveKeyValue/ValveKeyValue/Serialization/KeyValues1/KV1TextSerializer.cs
diff --git a/ValveKeyValue/ValveKeyValue/StringTable.cs b/ValveKeyValue/ValveKeyValue/StringTable.cs

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ static int Execute(`
`29`	`29`	`var options = new KVSerializerOptions`
`30`	`30`	`{`
`31`	`31`	`HasEscapeSequences = escape,`
`32`		`- EnableValveNullByteBugBehavior = valve_null_bug`
	`32`	`+ EnableValveNullByteBugBehavior = valve_null_bug`
`33`	`33`	`};`
`34`	`34`	`var serializer = KVSerializer.Create(KVSerializationFormat.KeyValues1Text);`
`35`	`35`	`var root = serializer.Deserialize(stream, options);`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-using System.Linq;`
`2`		`-`
`3`	`1`	`namespace ValveKeyValue.Test`
`4`	`2`	`{`
`5`	`3`	`class StringTableFromScratchTestCase`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public void DeserializeDateTimeNotSupported()`
`23`	`23`
`24`	`24`	`serializer.Serialize(ms, obj);`
`25`	`25`	`ms.Seek(0, SeekOrigin.Begin);`
`26`		`-`
	`26`	`+`
`27`	`27`	`Assert.That(`
`28`	`28`	`() => serializer.Deserialize<SerializedType>(ms),`
`29`	`29`	`Throws.InstanceOf<NotSupportedException>()`
`@@ -32,7 +32,7 @@ public void DeserializeDateTimeNotSupported()`
`32`	`32`
`33`	`33`	`class SerializedType`
`34`	`34`	`{`
`35`		`- public DateTime Value { get;set; }`
	`35`	`+ public DateTime Value { get; set; }`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using System.Collections;`
`2`		`-using System.Linq;`
`3`	`2`
`4`	`3`	`namespace ValveKeyValue.Test`
`5`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ Stream IIncludedFileLoader.OpenFile(string filePath)`
`52`	`52`	`else`
`53`	`53`	`{`
`54`	`54`	`throw new InvalidDataException($"Received an unexpected base or include: {filePath}");`
`55`		`- }`
	`55`	`+ }`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public void StronglyTypedDeserialization()`
`31`	`31`	`Assert.That(data.test3_oob, Is.True, nameof(data.test3_oob));`
`32`	`32`	`});`
`33`	`33`	`}`
`34`		`-`
	`34`	`+`
`35`	`35`	`[Test]`
`36`	`36`	`public void DynamicSerialization()`
`37`	`37`	`{`
`@@ -49,7 +49,7 @@ public void DynamicSerialization()`
`49`	`49`
`50`	`50`	`Assert.That(text, Is.EqualTo(expected));`
`51`	`51`	`}`
`52`		`-`
	`52`	`+`
`53`	`53`	`[Test]`
`54`	`54`	`public void StronglyTypedSerialization()`
`55`	`55`	`{`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ Stream IIncludedFileLoader.OpenFile(string filePath)`
`51`	`51`	`else`
`52`	`52`	`{`
`53`	`53`	`throw new InvalidDataException($"Received an unexpected base or include: {filePath}");`
`54`		`- }`
	`54`	`+ }`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,6 @@ public void SetUp()`
`37`	`37`	`person = new TReader().Read<Person>("Text.object_person.vdf");`
`38`	`38`	`}`
`39`	`39`
`40`		`- record Person (string FirstName, string LastName, bool CanFixIt);`
	`40`	`+ record Person(string FirstName, string LastName, bool CanFixIt);`
`41`	`41`	`}`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ sealed class KVObjectVisitor`
`4`	`4`	`{`
`5`	`5`	`public KVObjectVisitor(IVisitationListener listener)`
`6`	`6`	`{`
`7`		`- Require.NotNull(listener, nameof(listener));`
	`7`	`+ ArgumentNullException.ThrowIfNull(listener);`
`8`	`8`
`9`	`9`	`this.listener = listener;`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@ sealed class DefaultObjectReflector : IObjectReflector`
`7`	`7`	`{`
`8`	`8`	`IEnumerable<IObjectMember> IObjectReflector.GetMembers([DynamicallyAccessedMembers(Trimming.Properties)] Type objectType, object @object)`
`9`	`9`	`{`
`10`		`- Require.NotNull(objectType, nameof(objectType));`
`11`		`- Require.NotNull(@object, nameof(@object));`
	`10`	`+ ArgumentNullException.ThrowIfNull(objectType);`
	`11`	`+ ArgumentNullException.ThrowIfNull(@object);`
`12`	`12`
`13`	`13`	`if (IsValueTupleType(objectType))`
`14`	`14`	`{`