Simplify using statements

Author: jozefizso

src/Kavod.Vba.Compression/CompressedChunkData.cs

@@ -28,15 +28,13 @@ internal CompressedChunkData(BinaryReader dataReader, UInt16 compressedChunkData
         {
             var data = dataReader.ReadBytes(compressedChunkDataSize);
 
-            using (var reader = new BinaryReader(new MemoryStream(data)))
+            using var reader = new BinaryReader(new MemoryStream(data));
+            var position = 0;
+            while (reader.BaseStream.Position < reader.BaseStream.Length)
             {
-                var position = 0;
-                while (reader.BaseStream.Position < reader.BaseStream.Length)
-                {
-                    var sequence = TokenSequence.GetFromCompressedData(reader, position);
-                    _tokensequences.Add(sequence);
-                    position += (int)sequence.Tokens.Sum(t => t.Length);
-                }
+                var sequence = TokenSequence.GetFromCompressedData(reader, position);
+                _tokensequences.Add(sequence);
+                position += (int)sequence.Tokens.Sum(t => t.Length);
             }
         }
 

src/Kavod.Vba.Compression/CompressedContainer.cs

@@ -47,21 +47,17 @@ internal CompressedContainer(DecompressedBuffer buffer)
 
         internal byte[] SerializeData()
         {
-            using (var writer = new BinaryWriter(new MemoryStream()))
-            {
-                writer.Write(SignatureByteSig);
-
-                foreach (var chunk in CompressedChunks)
-                {
-                    writer.Write(chunk.SerializeData());
-                }
+            using var writer = new BinaryWriter(new MemoryStream());
+            writer.Write(SignatureByteSig);
 
-                using (var reader = new BinaryReader(writer.BaseStream))
-                {
-                    reader.BaseStream.Position = 0;
-                    return reader.ReadBytes((int) reader.BaseStream.Length);
-                }
+            foreach (var chunk in CompressedChunks)
+            {
+                writer.Write(chunk.SerializeData());
             }
+
+            using var reader = new BinaryReader(writer.BaseStream);
+            reader.BaseStream.Position = 0;
+            return reader.ReadBytes((int)reader.BaseStream.Length);
         }
     }
-}
+}

src/Kavod.Vba.Compression/DecompressedBuffer.cs

@@ -12,13 +12,11 @@ internal class DecompressedBuffer
     {
         internal DecompressedBuffer(byte[] uncompressedData)
         {
-            using (var reader = new BinaryReader(new MemoryStream(uncompressedData)))
+            using var reader = new BinaryReader(new MemoryStream(uncompressedData));
+            while (reader.BaseStream.Position < reader.BaseStream.Length)
             {
-                while (reader.BaseStream.Position < reader.BaseStream.Length)
-                {
-                    var chunk = new DecompressedChunk(reader);
-                    DecompressedChunks.Add(chunk);
-                }
+                var chunk = new DecompressedChunk(reader);
+                DecompressedChunks.Add(chunk);
             }
         }
 
@@ -36,20 +34,16 @@ internal byte[] Data
         {
             get
             {
-                using (var writer = new BinaryWriter(new MemoryStream()))
+                using var writer = new BinaryWriter(new MemoryStream());
+                foreach (var chunk in DecompressedChunks)
                 {
-                    foreach (var chunk in DecompressedChunks)
-                    {
-                        writer.Write(chunk.Data);
-                    }
+                    writer.Write(chunk.Data);
+                }
 
-                    using (var reader = new BinaryReader(writer.BaseStream))
-                    {
-                        reader.BaseStream.Position = 0;
+                using var reader = new BinaryReader(writer.BaseStream);
+                reader.BaseStream.Position = 0;
 
-                        return reader.ReadBytes((int) reader.BaseStream.Length);
-                    }
-                }
+                return reader.ReadBytes((int)reader.BaseStream.Length);
             }
         }
     }

src/Kavod.Vba.Compression/DecompressedChunk.cs

@@ -16,20 +16,18 @@ internal DecompressedChunk(CompressedChunk compressedChunk)
             if (compressedChunk.Header.IsCompressed)
             {
                 // Loop through all the data, get TokenSequences and decompress them.
-                using (var writer = new BinaryWriter(new MemoryStream()))
+                using var writer = new BinaryWriter(new MemoryStream());
+                var tokens = ((CompressedChunkData)compressedChunk.ChunkData).TokenSequences;
+                foreach (var sequence in tokens)
                 {
-                    var tokens = ((CompressedChunkData)compressedChunk.ChunkData).TokenSequences;
-                    foreach (var sequence in tokens)
-                    {
-                        sequence.Tokens.DecompressTokenSequence(writer);
-                    }
+                    sequence.Tokens.DecompressTokenSequence(writer);
+                }
 
-                    var stream = (MemoryStream)writer.BaseStream;
-                    var decompressedData = stream.GetBuffer();
-                    Array.Resize(ref decompressedData, (int)stream.Length);
+                var stream = (MemoryStream)writer.BaseStream;
+                var decompressedData = stream.GetBuffer();
+                Array.Resize(ref decompressedData, (int)stream.Length);
 
-                    Data = decompressedData;
-                }
+                Data = decompressedData;
             }
             else
             {