Fix usings and add braces for better merging

foesmm · Apr 3, 2020 · 400d2c1 · 400d2c1
1 parent 762497b
commit 400d2c1
Show file tree

Hide file tree

Showing 60 changed files with 736 additions and 66 deletions.
diff --git a/SharpCompress.sln.DotSettings b/SharpCompress.sln.DotSettings
@@ -126,4 +126,7 @@
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=6af8f80e_002D9fdd_002D4223_002D8e02_002D473db916f9b2/@EntryIndexedValue">&lt;SessionState ContinuousTestingIsOn="False" ContinuousTestingMode="0" FrameworkVersion="{x:Null}" IsLocked="False" Name="All tests from Solution" PlatformMonoPreference="{x:Null}" PlatformType="{x:Null}" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"&gt;
+  &lt;Solution /&gt;
+&lt;/SessionState&gt;</s:String></wpf:ResourceDictionary>
diff --git a/src/SharpCompress/Common/GZip/GZipEntry.cs b/src/SharpCompress/Common/GZip/GZipEntry.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Text;
 
 namespace SharpCompress.Common.GZip
 {

diff --git a/src/SharpCompress/Common/IEntry.Extensions.cs b/src/SharpCompress/Common/IEntry.Extensions.cs
@@ -1,5 +1,4 @@
 using System.IO;
-using SharpCompress.Readers;
 
 namespace SharpCompress.Common
 {

diff --git a/src/SharpCompress/Common/Rar/Headers/AVHeader.cs b/src/SharpCompress/Common/Rar/Headers/AVHeader.cs
@@ -7,8 +7,10 @@ internal class AvHeader : RarHeader
         public AvHeader(RarHeader header, RarCrcBinaryReader reader) 
             : base(header, reader, HeaderType.Av) 
         {
-            if (IsRar5) 
+            if (IsRar5)
+            {
                 throw new InvalidFormatException("unexpected rar5 record");
+            }
         }
 
         protected override void ReadFinish(MarkingBinaryReader reader)

diff --git a/src/SharpCompress/Common/Rar/Headers/ArchiveHeader.cs b/src/SharpCompress/Common/Rar/Headers/ArchiveHeader.cs
@@ -38,7 +38,11 @@ protected override void ReadFinish(MarkingBinaryReader reader)
         private void ReadLocator(MarkingBinaryReader reader) {
             var size = reader.ReadRarVIntUInt16();
             var type = reader.ReadRarVIntUInt16();
-            if (type != 1) throw new InvalidFormatException("expected locator record");
+            if (type != 1)
+            {
+                throw new InvalidFormatException("expected locator record");
+            }
+
             var flags = reader.ReadRarVIntUInt16();
             const ushort hasQuickOpenOffset = 0x01;
             const ushort hasRecoveryOffset = 0x02;

diff --git a/src/SharpCompress/Common/Rar/Headers/CommentHeader.cs b/src/SharpCompress/Common/Rar/Headers/CommentHeader.cs
@@ -7,7 +7,10 @@ internal class CommentHeader : RarHeader
         protected CommentHeader(RarHeader header, RarCrcBinaryReader reader)
             : base(header, reader, HeaderType.Comment) 
         { 
-            if (IsRar5) throw new InvalidFormatException("unexpected rar5 record");
+            if (IsRar5)
+            {
+                throw new InvalidFormatException("unexpected rar5 record");
+            }
         }
 
         protected override void ReadFinish(MarkingBinaryReader reader)

diff --git a/src/SharpCompress/Common/Rar/Headers/MarkHeader.cs b/src/SharpCompress/Common/Rar/Headers/MarkHeader.cs
@@ -46,19 +46,38 @@ public static MarkHeader Read(Stream stream, bool leaveStreamOpen, bool lookForH
                         if (b == 0x61) 
                         {
                             b = GetByte(stream); start++;
-                            if (b != 0x72) continue;
+                            if (b != 0x72)
+                            {
+                                continue;
+                            }
+
                             b = GetByte(stream); start++;
-                            if (b != 0x21) continue;
+                            if (b != 0x21)
+                            {
+                                continue;
+                            }
+
                             b = GetByte(stream); start++;
-                            if (b != 0x1a) continue;
+                            if (b != 0x1a)
+                            {
+                                continue;
+                            }
+
                             b = GetByte(stream); start++;
-                            if (b != 0x07) continue;
+                            if (b != 0x07)
+                            {
+                                continue;
+                            }
 
                             b = GetByte(stream); start++;
                             if (b == 1) 
                             {
                                 b = GetByte(stream); start++;
-                                if (b != 0) continue;
+                                if (b != 0)
+                                {
+                                    continue;
+                                }
+
                                 return new MarkHeader(true); // Rar5
                             } 
                             else if (b == 0) 
@@ -69,9 +88,17 @@ public static MarkHeader Read(Stream stream, bool leaveStreamOpen, bool lookForH
                         else if (b == 0x45) 
                         {
                             b = GetByte(stream); start++;
-                            if (b != 0x7e) continue;
+                            if (b != 0x7e)
+                            {
+                                continue;
+                            }
+
                             b = GetByte(stream); start++;
-                            if (b != 0x5e) continue;
+                            if (b != 0x5e)
+                            {
+                                continue;
+                            }
+
                             throw new InvalidFormatException("Rar format version pre-4 is unsupported.");
                         } 
                     } 

diff --git a/src/SharpCompress/Common/Rar/Headers/ProtectHeader.cs b/src/SharpCompress/Common/Rar/Headers/ProtectHeader.cs
@@ -8,7 +8,10 @@ internal class ProtectHeader : RarHeader
         public ProtectHeader(RarHeader header, RarCrcBinaryReader reader) 
             : base(header, reader, HeaderType.Protect) 
         {
-            if (IsRar5) throw new InvalidFormatException("unexpected rar5 record");
+            if (IsRar5)
+            {
+                throw new InvalidFormatException("unexpected rar5 record");
+            }
         }
 
         protected override void ReadFinish(MarkingBinaryReader reader)

diff --git a/src/SharpCompress/Common/Rar/Headers/RarHeaderFactory.cs b/src/SharpCompress/Common/Rar/Headers/RarHeaderFactory.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.IO;
 using SharpCompress.IO;

diff --git a/src/SharpCompress/Common/Rar/Headers/SignHeader.cs b/src/SharpCompress/Common/Rar/Headers/SignHeader.cs
@@ -7,7 +7,10 @@ internal class SignHeader : RarHeader
         protected SignHeader(RarHeader header, RarCrcBinaryReader reader)
             : base(header, reader, HeaderType.Sign) 
         { 
-            if (IsRar5) throw new InvalidFormatException("unexpected rar5 record");
+            if (IsRar5)
+            {
+                throw new InvalidFormatException("unexpected rar5 record");
+            }
         }
 
         protected override void ReadFinish(MarkingBinaryReader reader)

diff --git a/src/SharpCompress/Common/SevenZip/SevenZipVolume.cs b/src/SharpCompress/Common/SevenZip/SevenZipVolume.cs
@@ -1,5 +1,4 @@
 using System.IO;
-using SharpCompress.Archives;
 using SharpCompress.Readers;
 
 namespace SharpCompress.Common.SevenZip

diff --git a/src/SharpCompress/Common/Tar/TarEntry.cs b/src/SharpCompress/Common/Tar/TarEntry.cs
@@ -3,7 +3,6 @@
 using System.IO;
 using SharpCompress.Common.Tar.Headers;
 using SharpCompress.IO;
-using System.Text;
 
 namespace SharpCompress.Common.Tar
 {

diff --git a/src/SharpCompress/Common/Tar/TarHeaderFactory.cs b/src/SharpCompress/Common/Tar/TarHeaderFactory.cs
@@ -2,7 +2,6 @@
 using System.IO;
 using SharpCompress.Common.Tar.Headers;
 using SharpCompress.IO;
-using System.Text;
 
 namespace SharpCompress.Common.Tar
 {

diff --git a/src/SharpCompress/Common/Zip/Headers/DirectoryEntryHeader.cs b/src/SharpCompress/Common/Zip/Headers/DirectoryEntryHeader.cs
@@ -1,6 +1,5 @@
 using System.IO;
 using System.Linq;
-using System.Text;
 
 namespace SharpCompress.Common.Zip.Headers
 {

diff --git a/src/SharpCompress/Common/Zip/Headers/IgnoreHeader.cs b/src/SharpCompress/Common/Zip/Headers/IgnoreHeader.cs
@@ -1,5 +1,4 @@
-using System;
-using System.IO;
+using System.IO;
 
 namespace SharpCompress.Common.Zip.Headers
 {

diff --git a/src/SharpCompress/Common/Zip/Headers/LocalEntryHeader.cs b/src/SharpCompress/Common/Zip/Headers/LocalEntryHeader.cs
@@ -1,6 +1,5 @@
 using System.IO;
 using System.Linq;
-using System.Text;
 
 namespace SharpCompress.Common.Zip.Headers
 {

diff --git a/src/SharpCompress/Common/Zip/Headers/Zip64DirectoryEndHeader.cs b/src/SharpCompress/Common/Zip/Headers/Zip64DirectoryEndHeader.cs
@@ -1,5 +1,4 @@
-using System;
-using System.IO;
+using System.IO;
 
 namespace SharpCompress.Common.Zip.Headers
 {

diff --git a/src/SharpCompress/Common/Zip/PkwareTraditionalEncryptionData.cs b/src/SharpCompress/Common/Zip/PkwareTraditionalEncryptionData.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Text;
 using SharpCompress.Common.Zip.Headers;
 using SharpCompress.Compressors.Deflate;
 

diff --git a/src/SharpCompress/Common/Zip/SeekableZipHeaderFactory.cs b/src/SharpCompress/Common/Zip/SeekableZipHeaderFactory.cs
@@ -3,7 +3,6 @@
 using System.IO;
 using SharpCompress.Common.Zip.Headers;
 using SharpCompress.IO;
-using System.Text;
 
 namespace SharpCompress.Common.Zip
 {
@@ -35,7 +34,9 @@ internal IEnumerable<ZipHeader> ReadSeekableHeader(Stream stream)
                 stream.Seek(zip64Locator.RelativeOffsetOfTheEndOfDirectoryRecord, SeekOrigin.Begin);
                 uint zip64Signature = reader.ReadUInt32();
                 if (zip64Signature != ZIP64_END_OF_CENTRAL_DIRECTORY)
+                {
                     throw new ArchiveException("Failed to locate the Zip64 Header");
+                }
 
                 var zip64Entry = new Zip64DirectoryEndHeader();
                 zip64Entry.Read(reader);
@@ -55,7 +56,9 @@ internal IEnumerable<ZipHeader> ReadSeekableHeader(Stream stream)
                 position = stream.Position;
 
                 if (nextHeader == null)
+                {
                     yield break;
+                }
 
                 if (nextHeader is DirectoryEntryHeader entryHeader)
                 {

diff --git a/src/SharpCompress/Common/Zip/StreamingZipHeaderFactory.cs b/src/SharpCompress/Common/Zip/StreamingZipHeaderFactory.cs
@@ -2,7 +2,6 @@
 using System.IO;
 using SharpCompress.Common.Zip.Headers;
 using SharpCompress.IO;
-using System.Text;
 
 namespace SharpCompress.Common.Zip
 {

diff --git a/src/SharpCompress/Common/Zip/ZipHeaderFactory.cs b/src/SharpCompress/Common/Zip/ZipHeaderFactory.cs
@@ -3,7 +3,6 @@
 using System.Linq;
 using SharpCompress.Common.Zip.Headers;
 using SharpCompress.IO;
-using System.Text;
 
 namespace SharpCompress.Common.Zip
 {

diff --git a/src/SharpCompress/Compressors/Deflate64/Deflate64Stream.cs b/src/SharpCompress/Compressors/Deflate64/Deflate64Stream.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using SharpCompress.Common.Zip;
-using SharpCompress.Compressors.Deflate;
 using System;
 using System.Diagnostics;
 using System.IO;
@@ -23,11 +22,19 @@ public sealed class Deflate64Stream : Stream
         public Deflate64Stream(Stream stream, CompressionMode mode)
         {
             if (stream == null)
+            {
                 throw new ArgumentNullException(nameof(stream));
+            }
+
             if (mode != CompressionMode.Decompress)
+            {
                 throw new NotImplementedException("Deflate64: this implementation only supports decompression");
+            }
+
             if (!stream.CanRead)
+            {
                 throw new ArgumentException("Deflate64: input stream is not readable", nameof(stream));
+            }
 
             InitializeInflater(stream, ZipCompressionMethod.Deflate64);
         }
@@ -40,7 +47,9 @@ private void InitializeInflater(Stream stream, ZipCompressionMethod method = Zip
             Debug.Assert(stream != null);
             Debug.Assert(method == ZipCompressionMethod.Deflate || method == ZipCompressionMethod.Deflate64);
             if (!stream.CanRead)
+            {
                 throw new ArgumentException("Deflate64: input stream is not readable", nameof(stream));
+            }
 
             _inflater = new InflaterManaged(method == ZipCompressionMethod.Deflate64);
 
@@ -152,22 +161,32 @@ public override int Read(byte[] array, int offset, int count)
         private void ValidateParameters(byte[] array, int offset, int count)
         {
             if (array == null)
+            {
                 throw new ArgumentNullException(nameof(array));
+            }
 
             if (offset < 0)
+            {
                 throw new ArgumentOutOfRangeException(nameof(offset));
+            }
 
             if (count < 0)
+            {
                 throw new ArgumentOutOfRangeException(nameof(count));
+            }
 
             if (array.Length - offset < count)
+            {
                 throw new ArgumentException("Deflate64: invalid offset/count combination");
+            }
         }
 
         private void EnsureNotDisposed()
         {
             if (_stream == null)
+            {
                 ThrowStreamClosedException();
+            }
         }
 
         [MethodImpl(MethodImplOptions.NoInlining)]
@@ -179,7 +198,9 @@ private static void ThrowStreamClosedException()
         private void EnsureDecompressionMode()
         {
             if (_mode != CompressionMode.Decompress)
+            {
                 ThrowCannotReadFromDeflateManagedStreamException();
+            }
         }
 
         [MethodImpl(MethodImplOptions.NoInlining)]
@@ -191,7 +212,9 @@ private static void ThrowCannotReadFromDeflateManagedStreamException()
         private void EnsureCompressionMode()
         {
             if (_mode != CompressionMode.Compress)
+            {
                 ThrowCannotWriteToDeflateManagedStreamException();
+            }
         }
 
         [MethodImpl(MethodImplOptions.NoInlining)]
@@ -209,10 +232,14 @@ public override void Write(byte[] array, int offset, int count)
         private void PurgeBuffers(bool disposing)
         {
             if (!disposing)
+            {
                 return;
+            }
 
             if (_stream == null)
+            {
                 return;
+            }
 
             Flush();
         }

diff --git a/src/SharpCompress/Compressors/Deflate64/HuffmanTree.cs b/src/SharpCompress/Compressors/Deflate64/HuffmanTree.cs
@@ -277,9 +277,14 @@ public int GetNextSymbol(InputBuffer input)
                 {
                     symbol = -symbol;
                     if ((bitBuffer & mask) == 0)
+                    {
                         symbol = _left[symbol];
+                    }
                     else
+                    {
                         symbol = _right[symbol];
+                    }
+
                     mask <<= 1;
                 } while (symbol < 0);
             }

diff --git a/src/SharpCompress/Compressors/Deflate64/InflaterManaged.cs b/src/SharpCompress/Compressors/Deflate64/InflaterManaged.cs
@@ -220,7 +220,9 @@ private bool Decode()
                 // reading bfinal bit
                 // Need 1 bit
                 if (!_input.EnsureBitsAvailable(1))
+                {
                     return false;
+                }
 
                 _bfinal = _input.GetBits(1);
                 _state = InflaterState.ReadingBType;