Rebase

ValveKeyValue/ValveKeyValue.Test/Text/ConditionalTestCase.cs

@@ -1,3 +1,5 @@
+using System.Linq;
+
 namespace ValveKeyValue.Test
 {
     class ConditionalTestCase

ValveKeyValue/ValveKeyValue.Test/Text/InvalidConditionalTestCase.cs

@@ -1,3 +1,5 @@
+using System.Text;
+
 namespace ValveKeyValue.Test
 {
     class InvalidConditionalTestCase

ValveKeyValue/ValveKeyValue.Test/TextKV3/BasicKV3TestCases.cs

@@ -1,6 +1,4 @@
-using NUnit.Framework;
-
-namespace ValveKeyValue.Test.TextKV3
+namespace ValveKeyValue.Test.TextKV3
 {
     class BasicKV3TestCases
     {
@@ -97,7 +95,7 @@ public void DeserializesArray()
 
             var arrayValue = (KVArrayValue)data["arrayValue"];
 
-            Assert.That(arrayValue.Count, Is.EqualTo(2));
+            Assert.That(arrayValue, Has.Count.EqualTo(2));
             Assert.That(arrayValue[0].ToString(), Is.EqualTo("a"));
             Assert.That(arrayValue[1].ToString(), Is.EqualTo("b"));
 

ValveKeyValue/ValveKeyValue.Test/TextKV3/HeadersTestCase.cs

@@ -1,7 +1,4 @@
-using System;
-using System.IO;
-using System.Text;
-using NUnit.Framework;
+using System.Text;
 
 namespace ValveKeyValue.Test.TextKV3
 {

ValveKeyValue/ValveKeyValue.Test/TextKV3/Kv1ToKv3TestCase.cs

@@ -1,8 +1,4 @@
-using System;
-using System.IO;
-using NUnit.Framework;
-
-namespace ValveKeyValue.Test.TextKV3
+namespace ValveKeyValue.Test.TextKV3
 {
     class Kv1ToKv3TestCase
     {

ValveKeyValue/ValveKeyValue.Test/TextKV3/Kv3ToKv1TestCase.cs

@@ -1,7 +1,4 @@
-using System.IO;
-using NUnit.Framework;
-
-namespace ValveKeyValue.Test.TextKV3
+namespace ValveKeyValue.Test.TextKV3
 {
     class Kv3ToKv1TestCase
     {

ValveKeyValue/ValveKeyValue.Test/TextKV3/RootTypesTestCase.cs

@@ -1,6 +1,4 @@
-using NUnit.Framework;
-
-namespace ValveKeyValue.Test.TextKV3
+namespace ValveKeyValue.Test.TextKV3
 {
     class RootTypesTestCase
     {

ValveKeyValue/ValveKeyValue.Test/TextKV3/SerializationTestCase.cs

@@ -1,7 +1,4 @@
-using System.IO;
-using NUnit.Framework;
-
-namespace ValveKeyValue.Test.TextKV3
+namespace ValveKeyValue.Test.TextKV3
 {
     class SerializationTestCase
     {

ValveKeyValue/ValveKeyValue/Deserialization/KeyValues3/KV3TextReader.cs

@@ -1,6 +1,4 @@
-using System;
-using System.Globalization;
-using System.IO;
+using System.Globalization;
 using ValveKeyValue.Abstraction;
 
 namespace ValveKeyValue.Deserialization.KeyValues3
@@ -183,7 +181,7 @@ void ReadText(string text)
 
         void ReadBinaryBlob(string text)
         {
-            var bytes = Utils.ParseHexStringAsByteArrayNoReverse(text);
+            var bytes = HexStringHelper.ParseHexStringAsByteArray(text);
             var value = new KVBinaryBlob(bytes)
             {
                 Flag = stateMachine.GetAndResetFlag()

ValveKeyValue/ValveKeyValue/Deserialization/KeyValues3/KV3TextReaderStateMachine.cs

@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-
-namespace ValveKeyValue.Deserialization.KeyValues3
+namespace ValveKeyValue.Deserialization.KeyValues3
 {
     class KV3TextReaderStateMachine
     {

ValveKeyValue/ValveKeyValue/Deserialization/KeyValues3/KV3TokenReader.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
+using System.Linq;
 using System.Text;
 using ValveKeyValue.KeyValues3;
 using Encoding = ValveKeyValue.KeyValues3.Encoding;

ValveKeyValue/ValveKeyValue/KVArrayValue.cs

@@ -1,6 +1,4 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
+using System.Collections;
 
 namespace ValveKeyValue
 {

ValveKeyValue/ValveKeyValue/KVBinaryBlob.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Text;
+using System.Text;
 
 namespace ValveKeyValue
 {

ValveKeyValue/ValveKeyValue/KVFile.cs

@@ -1,6 +1,4 @@
-using System;
-
-namespace ValveKeyValue
+namespace ValveKeyValue
 {
     public class KVFile : KVObject
     {

ValveKeyValue/ValveKeyValue/KVFlag.cs

@@ -1,6 +1,4 @@
-using System;
-
-namespace ValveKeyValue
+namespace ValveKeyValue
 {
     public enum KVFlag
     {

ValveKeyValue/ValveKeyValue/KVHeader.cs

@@ -1,6 +1,4 @@
-using System;
-
-namespace ValveKeyValue
+namespace ValveKeyValue
 {
     public class KVHeader
     {

ValveKeyValue/ValveKeyValue/KVObject_IEnumerable.cs

@@ -1,4 +1,6 @@
-namespace ValveKeyValue
+using System.Collections;
+
+namespace ValveKeyValue
 {
     /// <summary>
     /// Represents a dynamic KeyValue object.

ValveKeyValue/ValveKeyValue/KeyValues3/Encoding.cs

@@ -1,6 +1,4 @@
-using System;
-
-namespace ValveKeyValue.KeyValues3
+namespace ValveKeyValue.KeyValues3
 {
     public class Encoding
     {

ValveKeyValue/ValveKeyValue/KeyValues3/Format.cs

@@ -1,6 +1,4 @@
-using System;
-
-namespace ValveKeyValue.KeyValues3
+namespace ValveKeyValue.KeyValues3
 {
     public class Format
     {

ValveKeyValue/ValveKeyValue/Serialization/KeyValues1/KV1TextSerializer.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.IO;
 using System.Text;
 using ValveKeyValue.Abstraction;
 
@@ -24,7 +21,7 @@ public KV1TextSerializer(Stream stream, KVSerializerOptions options)
         readonly KVSerializerOptions options;
         readonly TextWriter writer;
         int indentation = 0;
-        Stack<int> arrayCount = new();
+        readonly Stack<int> arrayCount = new();
 
         public void Dispose()
         {

ValveKeyValue/ValveKeyValue/Serialization/KeyValues3/KV3TextSerializer.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
+using System.Text;
 using ValveKeyValue.Abstraction;
 
 namespace ValveKeyValue.Serialization.KeyValues3
@@ -23,7 +20,7 @@ public KV3TextSerializer(Stream stream)
 
         readonly TextWriter writer;
         int indentation = 0;
-        Stack<bool> inArray = new();
+        readonly Stack<bool> inArray = new();
 
         bool IsInArray => inArray.Count > 0 && inArray.Peek();