Merge pull request #359 from stefannikolei/sn/update-shared-infra

Update SharedInfra

Author: JimBobSquarePants

.editorconfig

@@ -161,6 +161,9 @@ csharp_style_deconstructed_variable_declaration = true:warning
 csharp_style_prefer_index_operator = true:warning
 csharp_style_prefer_range_operator = true:warning
 csharp_style_implicit_object_creation_when_type_is_apparent = true:error
+# ReSharper inspection severities
+resharper_arrange_object_creation_when_type_evident_highlighting = error
+resharper_arrange_object_creation_when_type_not_evident_highlighting = error
 # "Null" checking preferences
 csharp_style_throw_expression = true:warning
 csharp_style_conditional_delegate_call = true:warning
@@ -174,6 +177,9 @@ 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

samples/DrawShapesWithImageSharp/ImageSharpLogo.cs

@@ -17,10 +17,10 @@ public static void SaveLogo(float size, string path)
         // the point are based on a 1206x1206 shape so size requires scaling from there
         float scalingFactor = size / 1206;
 
-        var center = new Vector2(603);
+        Vector2 center = new(603);
 
         // segment whose center of rotation should be
-        var segmentOffset = new Vector2(301.16968f, 301.16974f);
+        Vector2 segmentOffset = new(301.16968f, 301.16974f);
         IPath segment = new Polygon(
             new LinearLineSegment(new Vector2(230.54f, 361.0261f), new Vector2(5.8641942f, 361.46031f)),
             new CubicBezierLineSegment(
@@ -30,28 +30,28 @@ public static void SaveLogo(float size, string path)
                 new Vector2(78.26f, 97.0461f))).Translate(center - segmentOffset);
 
         // we need to create 6 of theses all rotated about the center point
-        var segments = new List<IPath>();
+        List<IPath> segments = [];
         for (int i = 0; i < 6; i++)
         {
             float angle = i * ((float)Math.PI / 3);
             IPath s = segment.Transform(Matrix3x2.CreateRotation(angle, center));
             segments.Add(s);
         }
 
-        var colors = new List<Color>()
-        {
+        List<Color> colors =
+        [
             Color.ParseHex("35a849"),
             Color.ParseHex("fcee21"),
             Color.ParseHex("ed7124"),
             Color.ParseHex("cb202d"),
             Color.ParseHex("5f2c83"),
-            Color.ParseHex("085ba7"),
-        };
+            Color.ParseHex("085ba7")
+        ];
 
-        var scaler = Matrix3x2.CreateScale(scalingFactor, Vector2.Zero);
+        Matrix3x2 scaler = Matrix3x2.CreateScale(scalingFactor, Vector2.Zero);
 
         int dimensions = (int)Math.Ceiling(size);
-        using (var img = new Image<Rgba32>(dimensions, dimensions))
+        using (Image<Rgba32> img = new(dimensions, dimensions))
         {
             img.Mutate(i => i.Fill(Color.Black));
             img.Mutate(i => i.Fill(Color.ParseHex("e1e1e1ff"), new EllipsePolygon(center, 600f).Transform(scaler)));

samples/DrawShapesWithImageSharp/Program.cs

@@ -67,7 +67,7 @@ public static IImageProcessingContext Fill(
         Brush brush,
         Action<PathBuilder> region)
     {
-        var pb = new PathBuilder();
+        PathBuilder pb = new();
         region(pb);
 
         return source.Fill(options, brush, pb.Build());

shared-infrastructure

@@ -54,8 +54,8 @@ public PatternBrush(Color foreColor, Color backColor, bool[,] pattern)
     /// <param name="pattern">The pattern.</param>
     internal PatternBrush(Color foreColor, Color backColor, in DenseMatrix<bool> pattern)
     {
-        var foreColorVector = foreColor.ToScaledVector4();
-        var backColorVector = backColor.ToScaledVector4();
+        Vector4 foreColorVector = foreColor.ToScaledVector4();
+        Vector4 backColorVector = backColor.ToScaledVector4();
         this.pattern = new DenseMatrix<Color>(pattern.Columns, pattern.Rows);
         this.patternVector = new DenseMatrix<Vector4>(pattern.Columns, pattern.Rows);
         for (int i = 0; i < pattern.Data.Length; i++)

src/ImageSharp.Drawing/Processing/Extensions/FillPathBuilderExtensions.cs

@@ -8,11 +8,11 @@ namespace SixLabors.ImageSharp.Drawing.Processing;
 /// </summary>
 public static class Pens
 {
-    private static readonly float[] DashDotPattern = { 3f, 1f, 1f, 1f };
-    private static readonly float[] DashDotDotPattern = { 3f, 1f, 1f, 1f, 1f, 1f };
-    private static readonly float[] DottedPattern = { 1f, 1f };
-    private static readonly float[] DashedPattern = { 3f, 1f };
-    internal static readonly float[] EmptyPattern = Array.Empty<float>();
+    private static readonly float[] DashDotPattern = [3f, 1f, 1f, 1f];
+    private static readonly float[] DashDotDotPattern = [3f, 1f, 1f, 1f, 1f, 1f];
+    private static readonly float[] DottedPattern = [1f, 1f];
+    private static readonly float[] DashedPattern = [3f, 1f];
+    internal static readonly float[] EmptyPattern = [];
 
     /// <summary>
     /// Create a solid pen without any drawing patterns

src/ImageSharp.Drawing/Processing/PatternBrush.cs

@@ -41,8 +41,8 @@ public void Execute()
         RectangleF bounds = this.definition.Region.Bounds;
 
         // add some clamping offsets to the brush to account for the target drawing location due to the cloned image not fill the image as expected
-        var offsetX = 0;
-        var offsetY = 0;
+        int offsetX = 0;
+        int offsetY = 0;
         if (bounds.X < 0)
         {
             offsetX = -(int)MathF.Floor(bounds.X);
@@ -53,10 +53,10 @@ public void Execute()
             offsetY = -(int)MathF.Floor(bounds.Y);
         }
 
-        var brush = new ImageBrush(clone, bounds, new Point(offsetX, offsetY));
+        ImageBrush brush = new(clone, bounds, new Point(offsetX, offsetY));
 
         // Grab hold of an image processor that can fill paths with a brush to allow it to do the hard pixel pushing for us
-        var processor = new FillPathProcessor(this.definition.Options, brush, this.definition.Region);
+        FillPathProcessor processor = new(this.definition.Options, brush, this.definition.Region);
         using IImageProcessor<TPixel> p = processor.CreatePixelSpecificProcessor(this.configuration, this.source, this.sourceRectangle);
 
         // Fill the shape using the image brush

src/ImageSharp.Drawing/Processing/Pens.cs

@@ -52,8 +52,8 @@ public IImageProcessor<TPixel> CreatePixelSpecificProcessor<TPixel>(Configuratio
 
         if (shape is RectangularPolygon rectPoly)
         {
-            var rectF = new RectangleF(rectPoly.Location, rectPoly.Size);
-            var rect = (Rectangle)rectF;
+            RectangleF rectF = new(rectPoly.Location, rectPoly.Size);
+            Rectangle rect = (Rectangle)rectF;
             if (!this.Options.GraphicsOptions.Antialias || rectF == rect)
             {
                 // Cast as in and back are the same or we are using anti-aliasing
@@ -63,7 +63,7 @@ public IImageProcessor<TPixel> CreatePixelSpecificProcessor<TPixel>(Configuratio
         }
 
         // Clone the definition so we can pass the transformed path.
-        var definition = new FillPathProcessor(this.Options, this.Brush, shape);
+        FillPathProcessor definition = new(this.Options, this.Brush, shape);
         return new FillPathProcessor<TPixel>(configuration, definition, source, sourceRectangle);
     }
 }

src/ImageSharp.Drawing/Processing/Processors/Drawing/ClipPathProcessor{TPixel}.cs

@@ -118,7 +118,7 @@ private static RichTextOptions ConfigureOptions(RichTextOptions options)
         // and not adjust the origin. Any translation should be applied to the path.
         if (options.Path is not null && options.Origin != Vector2.Zero)
         {
-            return new(options)
+            return new RichTextOptions(options)
             {
                 Origin = Vector2.Zero,
                 Path = options.Path.Translate(options.Origin)