Merge pull request #2957 from stefannikolei/sn/ref/collection_expressions

Convert CodeBase to collection Expressions

Author: JimBobSquarePants

.editorconfig

@@ -177,6 +177,11 @@ csharp_using_directive_placement = outside_namespace:warning
 csharp_prefer_static_local_function = true:warning
 # Primary constructor preferences
 csharp_style_prefer_primary_constructors = false:none
+# Collection preferences
+dotnet_style_prefer_collection_expression = true:error
+resharper_use_collection_expression_highlighting =true:error
+
+
 
 ##########################################
 # Unnecessary Code Rules

shared-infrastructure

@@ -15,8 +15,8 @@ public partial struct Color
     /// </summary>
     public static ReadOnlyMemory<Color> WebSafePalette => WebSafePaletteLazy.Value;
 
-    private static Color[] CreateWebSafePalette() => new[]
-    {
+    private static Color[] CreateWebSafePalette() =>
+    [
         AliceBlue,
         AntiqueWhite,
         Aqua,
@@ -159,5 +159,5 @@ private static Color[] CreateWebSafePalette() => new[]
         WhiteSmoke,
         Yellow,
         YellowGreen
-    };
+    ];
 }

src/ImageSharp/Color/Color.WebSafePalette.cs

@@ -16,8 +16,8 @@ public partial struct Color
     /// </summary>
     public static ReadOnlyMemory<Color> WernerPalette => WernerPaletteLazy.Value;
 
-    private static Color[] CreateWernerPalette() => new[]
-    {
+    private static Color[] CreateWernerPalette() =>
+    [
         ParseHex("#f1e9cd"),
         ParseHex("#f2e7cf"),
         ParseHex("#ece6d0"),
@@ -128,5 +128,5 @@ private static Color[] CreateWernerPalette() => new[]
         ParseHex("#9b856b"),
         ParseHex("#766051"),
         ParseHex("#453b32")
-    };
+    ];
 }

src/ImageSharp/Color/Color.WernerPalette.cs

@@ -35,8 +35,8 @@ static int FromChar(int c)
         {
             // Map from an ASCII char to its hex value, e.g. arr['b'] == 11. 0xFF means it's not a hex digit.
             // This doesn't actually allocate.
-            ReadOnlySpan<byte> charToHexLookup = new byte[]
-            {
+            ReadOnlySpan<byte> charToHexLookup =
+            [
                 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 15
                 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 31
                 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 47
@@ -52,8 +52,8 @@ static int FromChar(int c)
                 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 207
                 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 223
                 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 239
-                0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 255
-            };
+                0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF // 255
+            ];
 
             return (uint)c >= (uint)charToHexLookup.Length ? 0xFF : charToHexLookup[c];
         }

src/ImageSharp/Common/Helpers/HexConverter.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Six Labors.
+// Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
 // <auto-generated />

src/ImageSharp/Common/InlineArray.cs

@@ -16,7 +16,7 @@ namespace SixLabors.ImageSharp;
 <#GenerateInlineArrays();#>
 
 <#+
-private static int[] Lengths = new int[] {4, 8, 16 };
+private static int[] Lengths = [4, 8, 16 ];
 
 void GenerateInlineArrays()
 {

src/ImageSharp/Common/InlineArray.tt

@@ -32,11 +32,11 @@ internal static class Adler32
     private const int BlockSize = 1 << 5;
 
     // The C# compiler emits this as a compile-time constant embedded in the PE file.
-    private static ReadOnlySpan<byte> Tap1Tap2 => new byte[]
-    {
+    private static ReadOnlySpan<byte> Tap1Tap2 =>
+    [
         32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, // tap1
         16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1 // tap2
-    };
+    ];
 
     /// <summary>
     /// Calculates the Adler32 checksum with the bytes taken from the span.

src/ImageSharp/Compression/Zlib/Adler32.cs

@@ -124,25 +124,25 @@ internal static class DeflaterConstants
     /// <summary>
     /// Internal compression engine constant
     /// </summary>
-    public static int[] GOOD_LENGTH = { 0, 4, 4, 4, 4, 8, 8, 8, 32, 32 };
+    public static int[] GOOD_LENGTH = [0, 4, 4, 4, 4, 8, 8, 8, 32, 32];
 
     /// <summary>
     /// Internal compression engine constant
     /// </summary>
-    public static int[] MAX_LAZY = { 0, 4, 5, 6, 4, 16, 16, 32, 128, 258 };
+    public static int[] MAX_LAZY = [0, 4, 5, 6, 4, 16, 16, 32, 128, 258];
 
     /// <summary>
     /// Internal compression engine constant
     /// </summary>
-    public static int[] NICE_LENGTH = { 0, 8, 16, 32, 16, 32, 128, 128, 258, 258 };
+    public static int[] NICE_LENGTH = [0, 8, 16, 32, 16, 32, 128, 128, 258, 258];
 
     /// <summary>
     /// Internal compression engine constant
     /// </summary>
-    public static int[] MAX_CHAIN = { 0, 4, 8, 32, 16, 32, 128, 256, 1024, 4096 };
+    public static int[] MAX_CHAIN = [0, 4, 8, 32, 16, 32, 128, 256, 1024, 4096];
 
     /// <summary>
     /// Internal compression engine constant
     /// </summary>
-    public static int[] COMPR_FUNC = { 0, 1, 1, 1, 1, 2, 2, 2, 2, 2 };
+    public static int[] COMPR_FUNC = [0, 1, 1, 1, 1, 2, 2, 2, 2, 2];
 }

src/ImageSharp/Compression/Zlib/DeflaterConstants.cs

@@ -77,8 +77,8 @@ public DeflaterHuffman(MemoryAllocator memoryAllocator)
 
     // See RFC 1951 3.2.6
     // Literal codes
-    private static readonly short[] StaticLCodes = new short[]
-    {
+    private static readonly short[] StaticLCodes =
+    [
         12, 140, 76, 204, 44, 172, 108, 236, 28, 156, 92, 220, 60, 188, 124, 252,
         2, 130, 66, 194, 34, 162, 98, 226, 18, 146, 82, 210, 50, 178, 114, 242,
         10, 138, 74, 202, 42, 170, 106, 234, 26, 154, 90, 218, 58, 186, 122, 250,
@@ -97,10 +97,10 @@ public DeflaterHuffman(MemoryAllocator memoryAllocator)
         31, 287, 159, 415, 95, 351, 223, 479, 63, 319, 191, 447, 127, 383, 255, 511,
         0, 64, 32, 96, 16, 80, 48, 112, 8, 72, 40, 104, 24, 88, 56, 120, 4, 68, 36,
         100, 20, 84, 52, 116, 3, 131, 67, 195, 35, 163
-    };
+    ];
 
-    private static ReadOnlySpan<byte> StaticLLength => new byte[]
-    {
+    private static ReadOnlySpan<byte> StaticLLength =>
+    [
         8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
         8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
         8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
@@ -119,34 +119,34 @@ public DeflaterHuffman(MemoryAllocator memoryAllocator)
         9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
         7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
         7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8
-    };
+    ];
 
     // Distance codes and lengths.
-    private static readonly short[] StaticDCodes = new short[]
-    {
+    private static readonly short[] StaticDCodes =
+    [
         0, 16, 8, 24, 4, 20, 12, 28, 2, 18, 10, 26, 6, 22, 14,
         30, 1, 17, 9, 25, 5, 21, 13, 29, 3, 19, 11, 27, 7, 23
-    };
+    ];
 
-    private static ReadOnlySpan<byte> StaticDLength => new byte[]
-    {
+    private static ReadOnlySpan<byte> StaticDLength =>
+    [
         5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
         5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5
-    };
+    ];
 #pragma warning restore SA1201 // Elements should appear in the correct order
 
     /// <summary>
     /// Gets the lengths of the bit length codes are sent in order of decreasing probability, to avoid transmitting the lengths for unused bit length codes.
     /// </summary>
-    private static ReadOnlySpan<byte> BitLengthOrder => new byte[]
-    {
+    private static ReadOnlySpan<byte> BitLengthOrder =>
+    [
         16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15
-    };
+    ];
 
-    private static ReadOnlySpan<byte> Bit4Reverse => new byte[]
-    {
+    private static ReadOnlySpan<byte> Bit4Reverse =>
+    [
         0, 8, 4, 12, 2, 10, 6, 14, 1, 9, 5, 13, 3, 11, 7, 15
-    };
+    ];
 
     /// <summary>
     /// Gets the pending buffer to use.