Fix various remarks

CyLuGh · CyLuGh · commit c06428ba853f · 2025-09-08T16:27:07.000+02:00
diff --git a/src/HierarchyGrid.Definitions/HierarchyGridViewModel.cs b/src/HierarchyGrid.Definitions/HierarchyGridViewModel.cs
@@ -140,23 +140,23 @@ public Seq<PositionedCell> Selections
     public ConcurrentBag<(
         ElementCoordinates Coord,
         PositionedDefinition Definition
-    )> HeadersCoordinates { get; } = new();
+    )> HeadersCoordinates { get; } = [];
 
     /// <summary>
     /// Represents a collection of tuples that associate the coordinates of grid elements with their corresponding positioned cells.
     /// </summary>
     public ConcurrentBag<(
         ElementCoordinates Coord,
         PositionedCell Cell
-    )> CellsCoordinates { get; } = new();
+    )> CellsCoordinates { get; } = [];
 
     private HashMap<(int Row, int Column), PositionedCell> CellsCoordinatesMap { get; set; }
 
     public ConcurrentBag<(
         ElementCoordinates Coord,
         Guid Guid,
         Action Action
-    )> GlobalHeadersCoordinates { get; } = new();
+    )> GlobalHeadersCoordinates { get; } = [];
 
     [Reactive]
     public partial int HorizontalOffset { get; set; }
@@ -239,33 +239,41 @@ public void SetGridState(HierarchyGridState state, bool useCompare = false)
         {
             var rowsFlat = RowsDefinitions.FlatList();
             if (rowsFlat.Length == state.RowToggles.Length)
+            {
                 Parallel.For(
                     0,
                     state.RowToggles.Length,
                     i => rowsFlat[i].IsExpanded = state.RowToggles[i]
                 );
+            }
             else
+            {
                 rowsFlat
                     .AsParallel()
                     .ForAll(x =>
                     {
                         x.IsExpanded = true;
                     });
+            }
 
             var columnsFlat = ColumnsDefinitions.FlatList();
             if (columnsFlat.Length == state.ColumnToggles.Length)
+            {
                 Parallel.For(
                     0,
                     state.ColumnToggles.Length,
                     i => columnsFlat[i].IsExpanded = state.ColumnToggles[i]
                 );
+            }
             else
+            {
                 columnsFlat
                     .AsParallel()
                     .ForAll(x =>
                     {
                         x.IsExpanded = true;
                     });
+            }
 
             VerticalOffset = state.VerticalOffset;
             HorizontalOffset = state.HorizontalOffset;
@@ -618,15 +626,15 @@ public void Set(HierarchyDefinitions hierarchyDefinitions, bool preserveSizes =
         var rowDefinitions = Producers;
         var columnDefinitions = Consumers;
 
-        RowsHeadersWidth = Enumerable
-            .Range(0, rowDefinitions.TotalDepth())
-            .Select(_ => DefaultHeaderWidth)
-            .ToArray();
+        RowsHeadersWidth =
+        [
+            .. Enumerable.Range(0, rowDefinitions.TotalDepth()).Select(_ => DefaultHeaderWidth)
+        ];
 
-        ColumnsHeadersHeight = Enumerable
-            .Range(0, columnDefinitions.TotalDepth())
-            .Select(_ => DefaultHeaderHeight)
-            .ToArray();
+        ColumnsHeadersHeight =
+        [
+            .. Enumerable.Range(0, columnDefinitions.TotalDepth()).Select(_ => DefaultHeaderHeight)
+        ];
 
         var columnsCount = columnDefinitions.TotalCount(true);
         if (!preserveSizes || columnsCount != ColumnsWidths.Count)
@@ -959,6 +967,11 @@ bool isRightClick
         }
     }
 
+    [System.Diagnostics.CodeAnalysis.SuppressMessage(
+        "Performance",
+        "CA1868:Unnecessary call to 'Contains(item)'",
+        Justification = "<Pending>"
+    )]
     private void HandleMultiExtendedSelection(
         PositionedCell cell,
         bool isShiftPressed,
diff --git a/src/HierarchyGrid.Skia/CanvasExtensions.cs b/src/HierarchyGrid.Skia/CanvasExtensions.cs
@@ -8,7 +8,7 @@ namespace HierarchyGrid.Skia
 {
     internal static class CanvasExtensions
     {
-        private static Dictionary<string, Option<SKSvg>> _svgCache = new();
+        private static readonly Dictionary<string, Option<SKSvg>> _svgCache = [];
 
         private static Option<SKSvg> GetSvg(string path)
         {
@@ -292,10 +292,7 @@ double screenScale
         {
             double height = ComputeHeaderHeight(viewModel, hdef);
 
-            var top = Enumerable
-                .Range(0, hdef.Level)
-                .Select(x => viewModel.ColumnsHeadersHeight[x])
-                .Sum();
+            var top = Enumerable.Range(0, hdef.Level).Sum(x => viewModel.ColumnsHeadersHeight[x]);
 
             canvas.DrawHeader(
                 viewModel,
@@ -336,8 +333,7 @@ HierarchyDefinition hdef
                 ? viewModel.ColumnsHeadersHeight[hdef.Level]
                 : Enumerable
                     .Range(hdef.Level, viewModel.ColumnsHeadersHeight.Length - hdef.Level)
-                    .Select(x => viewModel.ColumnsHeadersHeight[x])
-                    .Sum();
+                    .Sum(x => viewModel.ColumnsHeadersHeight[x]);
             return height;
         }
 
@@ -363,13 +359,9 @@ double screenScale
 
             var width = Enumerable
                 .Range(column, hdef.Count() - origin.RelativePositionFrom(hdef))
-                .Select(x => viewModel.ColumnsWidths.GetValueOrDefault(x, 0))
-                .Sum();
+                .Sum(x => viewModel.ColumnsWidths.GetValueOrDefault(x, 0));
 
-            var top = Enumerable
-                .Range(0, hdef.Level)
-                .Select(x => viewModel.ColumnsHeadersHeight[x])
-                .Sum();
+            var top = Enumerable.Range(0, hdef.Level).Sum(x => viewModel.ColumnsHeadersHeight[x]);
             var height = viewModel.ColumnsHeadersHeight[hdef.Level];
 
             canvas.DrawHeader(
@@ -474,14 +466,12 @@ double screenScale
                 : Enumerable
                     .Range(hdef.Level, viewModel.RowsHeadersWidth.Length - hdef.Level)
                     .Where(x => x < viewModel.RowsHeadersWidth.Length)
-                    .Select(x => viewModel.RowsHeadersWidth[x])
-                    .Sum();
+                    .Sum(x => viewModel.RowsHeadersWidth[x]);
 
             var left = Enumerable
                 .Range(0, hdef.Level)
                 .Where(x => x < viewModel.RowsHeadersWidth.Length)
-                .Select(x => viewModel.RowsHeadersWidth[x])
-                .Sum();
+                .Sum(x => viewModel.RowsHeadersWidth[x]);
 
             canvas.DrawHeader(
                 viewModel,
@@ -531,14 +521,12 @@ double screenScale
 
             var height = Enumerable
                 .Range(row, hdef.Count() - origin.RelativePositionFrom(hdef))
-                .Select(x => viewModel.RowsHeights.GetValueOrDefault(x, 0))
-                .Sum();
+                .Sum(x => viewModel.RowsHeights.GetValueOrDefault(x, 0));
 
             var left = Enumerable
                 .Range(0, hdef.Level)
                 .Where(x => x < viewModel.RowsHeadersWidth.Length)
-                .Select(x => viewModel.RowsHeadersWidth[x])
-                .Sum();
+                .Sum(x => viewModel.RowsHeadersWidth[x]);
             var width = viewModel.RowsHeadersWidth[hdef.Level];
 
             canvas.DrawHeader(
@@ -711,25 +699,24 @@ GlobalHeader globalHeader
 
         private static SKPath BuildFoldAllPath(float left, float top, float width, float height)
         {
-            float startX = left + (width - 24) / 2;
-            float startY = top + (height - 24) / 2;
+            float startX = left + ((width - 24) / 2);
+            float startY = top + ((height - 24) / 2);
 
             const string data = """
                 M19 9h-2.58l3.29-3.29a1 1 0 1 0-1.42-1.42L15 7.57V5a1 1 0 0 0-1-1 1 1 0 0 0-1 1v5a1 1 0 0 0 1 1h5a1 1 0 0 0 0-2z
                 M10 13H5a1 1 0 0 0 0 2h2.57l-3.28 3.29a1 1 0 0 0 0 1.42 1 1 0 0 0 1.42 0L9 16.42V19a1 1 0 0 0 1 1 1 1 0 0 0 1-1v-5a1 1 0 0 0-1-1z
                 """;
 
             var p = SKPath.ParseSvgPathData(data);
-            //p.Transform(SKMatrix.CreateScale(1.5f, 1.5f));
             p.Transform(SKMatrix.CreateTranslation(startX, startY));
 
             return p;
         }
 
         private static SKPath BuildExpandAllPath(float left, float top, float width, float height)
         {
-            float startX = left + (width - 24) / 2;
-            float startY = top + (height - 24) / 2;
+            float startX = left + ((width - 24) / 2);
+            float startY = top + ((height - 24) / 2);
 
             const string data = """
                 M20 5a1 1 0 0 0-1-1h-5a1 1 0 0 0 0 2h2.57l-3.28 3.29a1 1 0 0 0 0 1.42 1 1 0 0 0 1.42 0L18 7.42V10a1 1 0 0 0 1 1 1 1 0 0 0 1-1z
@@ -751,7 +738,7 @@ private static SKPath BuildFoldedPath(
         {
             var startPoint =
                 width > 0f && height > 0f
-                    ? new SKPoint(left + (width - 24) / 2, top + (height - 24) / 2)
+                    ? new SKPoint(left + ((width - 24) / 2), top + ((height - 24) / 2))
                     : new SKPoint(3f + left, 5f + top);
 
             const string data = """
@@ -773,7 +760,7 @@ private static SKPath BuildExpandedPath(
         {
             var startPoint =
                 width > 0f && height > 0f
-                    ? new SKPoint(left + (width - 24f) / 2, top + (height - 24f) / 2)
+                    ? new SKPoint(left + ((width - 24f) / 2), top + ((height - 24f) / 2))
                     : new SKPoint(3f + left, 5f + top);
 
             const string data = """
@@ -892,7 +879,7 @@ private static void RenderDecor(
                 picture.CullRect.Height > cell.Height
                     ? (float)(cell.Top * screenScale)
                     : (float)(
-                        cell.Top + ((cell.Height - picture.CullRect.Height) / 2) * screenScale
+                        cell.Top + (screenScale * ((cell.Height - picture.CullRect.Height) / 2))
                     );
 
             canvas.DrawPicture(
@@ -1032,10 +1019,6 @@ ref SKRect rect
 
         private static TextBlock TextDrawer { get; } = new();
         private static TextPaintOptions TextPaintOptions { get; } =
-            new TextPaintOptions
-            {
-                Edging = SKFontEdging.SubpixelAntialias,
-                SubpixelPositioning = true
-            };
+            new TextPaintOptions { Edging = SKFontEdging.SubpixelAntialias };
     }
 }
diff --git a/src/HierarchyGrid.Skia/HierarchyGridDrawer.cs b/src/HierarchyGrid.Skia/HierarchyGridDrawer.cs
@@ -46,7 +46,7 @@ public static async Task Draw(
                 canvas.DrawColumnHeaders(
                     viewModel,
                     theme,
-                    v => v.ColumnsDefinitions.Leaves().ToArray(),
+                    v => [.. v.ColumnsDefinitions.Leaves()],
                     width,
                     ref headerCount,
                     screenScale
@@ -55,7 +55,7 @@ public static async Task Draw(
                 canvas.DrawRowHeaders(
                     viewModel,
                     theme,
-                    v => v.RowsDefinitions.Leaves().ToArray(),
+                    v => [.. v.RowsDefinitions.Leaves()],
                     height,
                     ref headerCount,
                     screenScale
