From fc20d9b925b83532a19467293a7cdcbaa4ef3d6b Mon Sep 17 00:00:00 2001
From: TSRBerry <20988865+TSRBerry@users.noreply.github.com>
Date: Wed, 28 Jun 2023 18:41:38 +0200
Subject: [Ryujinx.Common] Address dotnet-format issues (#5358)

* dotnet format style --severity info

Some changes were manually reverted.

* dotnet format analyzers --serverity info

Some changes have been minimally adapted.

* Restore a few unused methods and variables

* Silence dotnet format IDE0060 warnings

* Silence dotnet format IDE0059 warnings

* Address or silence dotnet format IDE1006 warnings

* Address dotnet format CA1816 warnings

* Address or silence dotnet format CA2211 warnings

* Silence CA1806 and CA1834 issues

* Fix formatting for switch expressions

* Address most dotnet format whitespace warnings

* Apply dotnet format whitespace formatting

A few of them have been manually reverted and the corresponding warning was silenced

* Revert formatting changes for while and for-loops

* Format if-blocks correctly

* Run dotnet format whitespace after rebase

* Run dotnet format style after rebase

* Run dotnet format analyzers after rebase

* Run dotnet format after rebase and remove unused usings

- analyzers
- style
- whitespace

* Add comments to disabled warnings

* Remove a few unused parameters

* Replace MmeShadowScratch with Array256<uint>

* Simplify properties and array initialization, Use const when possible, Remove trailing commas

* Run dotnet format after rebase

* Address IDE0251 warnings

* Revert "Simplify properties and array initialization, Use const when possible, Remove trailing commas"

This reverts commit 9462e4136c0a2100dc28b20cf9542e06790aa67e.

* dotnet format whitespace after rebase

* First dotnet format pass

* Second dotnet format pass

* Fix build issues

* Fix StructArrayHelpers.cs

* Apply suggestions from code review

Co-authored-by: Ac_K <Acoustik666@gmail.com>

* Fix return statements

* Fix naming rule violations

* Update src/Ryujinx.Common/Utilities/StreamUtils.cs

Co-authored-by: Ac_K <Acoustik666@gmail.com>

* Add trailing commas

* Address review feedback

* Address review feedback

* Rename remaining type parameters to TKey and TValue

* Fix manual formatting for logging levels

* Fix spacing before comments

---------

Co-authored-by: Ac_K <Acoustik666@gmail.com>
---
 src/Ryujinx.Common/Collections/IntervalTree.cs | 104 ++++++++++++-------------
 1 file changed, 52 insertions(+), 52 deletions(-)

(limited to 'src/Ryujinx.Common/Collections/IntervalTree.cs')

diff --git a/src/Ryujinx.Common/Collections/IntervalTree.cs b/src/Ryujinx.Common/Collections/IntervalTree.cs
index b5188cc7..2ea260a5 100644
--- a/src/Ryujinx.Common/Collections/IntervalTree.cs
+++ b/src/Ryujinx.Common/Collections/IntervalTree.cs
@@ -7,9 +7,9 @@ namespace Ryujinx.Common.Collections
     /// <summary>
     /// An Augmented Interval Tree based off of the "TreeDictionary"'s Red-Black Tree. Allows fast overlap checking of ranges.
     /// </summary>
-    /// <typeparam name="K">Key</typeparam>
-    /// <typeparam name="V">Value</typeparam>
-    public class IntervalTree<K, V> : IntrusiveRedBlackTreeImpl<IntervalTreeNode<K, V>> where K : IComparable<K>
+    /// <typeparam name="TKey">Key</typeparam>
+    /// <typeparam name="TValue">Value</typeparam>
+    public class IntervalTree<TKey, TValue> : IntrusiveRedBlackTreeImpl<IntervalTreeNode<TKey, TValue>> where TKey : IComparable<TKey>
     {
         private const int ArrayGrowthSize = 32;
 
@@ -22,11 +22,11 @@ namespace Ryujinx.Common.Collections
         /// <param name="overlaps">Overlaps array to place results in</param>
         /// <returns>Number of values found</returns>
         /// <exception cref="ArgumentNullException"><paramref name="key"/> is null</exception>
-        public int Get(K key, ref V[] overlaps)
+        public int Get(TKey key, ref TValue[] overlaps)
         {
             ArgumentNullException.ThrowIfNull(key);
 
-            IntervalTreeNode<K, V> node = GetNode(key);
+            IntervalTreeNode<TKey, TValue> node = GetNode(key);
 
             if (node == null)
             {
@@ -39,7 +39,7 @@ namespace Ryujinx.Common.Collections
             }
 
             int overlapsCount = 0;
-            foreach (RangeNode<K, V> value in node.Values)
+            foreach (RangeNode<TKey, TValue> value in node.Values)
             {
                 overlaps[overlapsCount++] = value.Value;
             }
@@ -56,7 +56,7 @@ namespace Ryujinx.Common.Collections
         /// <param name="overlapCount">Index to start writing results into the array. Defaults to 0</param>
         /// <returns>Number of values found</returns>
         /// <exception cref="ArgumentNullException"><paramref name="start"/> or <paramref name="end"/> is null</exception>
-        public int Get(K start, K end, ref V[] overlaps, int overlapCount = 0)
+        public int Get(TKey start, TKey end, ref TValue[] overlaps, int overlapCount = 0)
         {
             ArgumentNullException.ThrowIfNull(start);
             ArgumentNullException.ThrowIfNull(end);
@@ -73,7 +73,7 @@ namespace Ryujinx.Common.Collections
         /// <param name="end">End of the range to insert</param>
         /// <param name="value">Value to add</param>
         /// <exception cref="ArgumentNullException"><paramref name="start"/>, <paramref name="end"/> or <paramref name="value"/> are null</exception>
-        public void Add(K start, K end, V value)
+        public void Add(TKey start, TKey end, TValue value)
         {
             ArgumentNullException.ThrowIfNull(start);
             ArgumentNullException.ThrowIfNull(end);
@@ -89,7 +89,7 @@ namespace Ryujinx.Common.Collections
         /// <param name="value">Value to remove</param>
         /// <exception cref="ArgumentNullException"><paramref name="key"/> is null</exception>
         /// <returns>Number of deleted values</returns>
-        public int Remove(K key, V value)
+        public int Remove(TKey key, TValue value)
         {
             ArgumentNullException.ThrowIfNull(key);
 
@@ -104,9 +104,9 @@ namespace Ryujinx.Common.Collections
         /// Adds all the nodes in the dictionary into <paramref name="list"/>.
         /// </summary>
         /// <returns>A list of all RangeNodes sorted by Key Order</returns>
-        public List<RangeNode<K, V>> AsList()
+        public List<RangeNode<TKey, TValue>> AsList()
         {
-            List<RangeNode<K, V>> list = new List<RangeNode<K, V>>();
+            List<RangeNode<TKey, TValue>> list = new();
 
             AddToList(Root, list);
 
@@ -122,7 +122,7 @@ namespace Ryujinx.Common.Collections
         /// </summary>
         /// <param name="node">The node to search for RangeNodes within</param>
         /// <param name="list">The list to add RangeNodes to</param>
-        private void AddToList(IntervalTreeNode<K, V> node, List<RangeNode<K, V>> list)
+        private void AddToList(IntervalTreeNode<TKey, TValue> node, List<RangeNode<TKey, TValue>> list)
         {
             if (node == null)
             {
@@ -142,11 +142,11 @@ namespace Ryujinx.Common.Collections
         /// <param name="key">Key of the node to get</param>
         /// <returns>Node reference in the tree</returns>
         /// <exception cref="ArgumentNullException"><paramref name="key"/> is null</exception>
-        private IntervalTreeNode<K, V> GetNode(K key)
+        private IntervalTreeNode<TKey, TValue> GetNode(TKey key)
         {
             ArgumentNullException.ThrowIfNull(key);
 
-            IntervalTreeNode<K, V> node = Root;
+            IntervalTreeNode<TKey, TValue> node = Root;
             while (node != null)
             {
                 int cmp = key.CompareTo(node.Start);
@@ -173,7 +173,7 @@ namespace Ryujinx.Common.Collections
         /// <param name="end">End of the range</param>
         /// <param name="overlaps">Overlaps array to place results in</param>
         /// <param name="overlapCount">Overlaps count to update</param>
-        private void GetValues(IntervalTreeNode<K, V> node, K start, K end, ref V[] overlaps, ref int overlapCount)
+        private void GetValues(IntervalTreeNode<TKey, TValue> node, TKey start, TKey end, ref TValue[] overlaps, ref int overlapCount)
         {
             if (node == null || start.CompareTo(node.Max) >= 0)
             {
@@ -188,7 +188,7 @@ namespace Ryujinx.Common.Collections
                 if (start.CompareTo(node.End) < 0)
                 {
                     // Contains this node. Add overlaps to list.
-                    foreach (RangeNode<K,V> overlap in node.Values)
+                    foreach (RangeNode<TKey, TValue> overlap in node.Values)
                     {
                         if (start.CompareTo(overlap.End) < 0)
                         {
@@ -212,9 +212,9 @@ namespace Ryujinx.Common.Collections
         /// <param name="start">Start of the range to insert</param>
         /// <param name="end">End of the range to insert</param>
         /// <param name="value">Value to insert</param>
-        private void Insert(K start, K end, V value)
+        private void Insert(TKey start, TKey end, TValue value)
         {
-            IntervalTreeNode<K, V> newNode = BSTInsert(start, end, value);
+            IntervalTreeNode<TKey, TValue> newNode = BSTInsert(start, end, value);
             RestoreBalanceAfterInsertion(newNode);
         }
 
@@ -223,10 +223,10 @@ namespace Ryujinx.Common.Collections
         /// This should only be called if the max increases - not for rebalancing or removals.
         /// </summary>
         /// <param name="node">The node to start propagating from</param>
-        private void PropagateIncrease(IntervalTreeNode<K, V> node)
+        private static void PropagateIncrease(IntervalTreeNode<TKey, TValue> node)
         {
-            K max = node.Max;
-            IntervalTreeNode<K, V> ptr = node;
+            TKey max = node.Max;
+            IntervalTreeNode<TKey, TValue> ptr = node;
 
             while ((ptr = ptr.Parent) != null)
             {
@@ -246,13 +246,13 @@ namespace Ryujinx.Common.Collections
         /// This fully recalculates the max value from all children when there is potential for it to decrease.
         /// </summary>
         /// <param name="node">The node to start propagating from</param>
-        private void PropagateFull(IntervalTreeNode<K, V> node)
+        private static void PropagateFull(IntervalTreeNode<TKey, TValue> node)
         {
-            IntervalTreeNode<K, V> ptr = node;
+            IntervalTreeNode<TKey, TValue> ptr = node;
 
             do
             {
-                K max = ptr.End;
+                TKey max = ptr.End;
 
                 if (ptr.Left != null && ptr.Left.Max.CompareTo(max) > 0)
                 {
@@ -278,10 +278,10 @@ namespace Ryujinx.Common.Collections
         /// <param name="end">End of the range to insert</param>
         /// <param name="value">Value to insert</param>
         /// <returns>The inserted Node</returns>
-        private IntervalTreeNode<K, V> BSTInsert(K start, K end, V value)
+        private IntervalTreeNode<TKey, TValue> BSTInsert(TKey start, TKey end, TValue value)
         {
-            IntervalTreeNode<K, V> parent = null;
-            IntervalTreeNode<K, V> node = Root;
+            IntervalTreeNode<TKey, TValue> parent = null;
+            IntervalTreeNode<TKey, TValue> node = Root;
 
             while (node != null)
             {
@@ -297,7 +297,7 @@ namespace Ryujinx.Common.Collections
                 }
                 else
                 {
-                    node.Values.Add(new RangeNode<K, V>(start, end, value));
+                    node.Values.Add(new RangeNode<TKey, TValue>(start, end, value));
 
                     if (end.CompareTo(node.End) > 0)
                     {
@@ -313,7 +313,7 @@ namespace Ryujinx.Common.Collections
                     return node;
                 }
             }
-            IntervalTreeNode<K, V> newNode = new IntervalTreeNode<K, V>(start, end, value, parent);
+            IntervalTreeNode<TKey, TValue> newNode = new(start, end, value, parent);
             if (newNode.Parent == null)
             {
                 Root = newNode;
@@ -338,9 +338,9 @@ namespace Ryujinx.Common.Collections
         /// <param name="key">Key to search for</param>
         /// <param name="value">Value to delete</param>
         /// <returns>Number of deleted values</returns>
-        private int Delete(K key, V value)
+        private int Delete(TKey key, TValue value)
         {
-            IntervalTreeNode<K, V> nodeToDelete = GetNode(key);
+            IntervalTreeNode<TKey, TValue> nodeToDelete = GetNode(key);
 
             if (nodeToDelete == null)
             {
@@ -362,7 +362,7 @@ namespace Ryujinx.Common.Collections
                 return removed;
             }
 
-            IntervalTreeNode<K, V> replacementNode;
+            IntervalTreeNode<TKey, TValue> replacementNode;
 
             if (LeftOf(nodeToDelete) == null || RightOf(nodeToDelete) == null)
             {
@@ -373,7 +373,7 @@ namespace Ryujinx.Common.Collections
                 replacementNode = PredecessorOf(nodeToDelete);
             }
 
-            IntervalTreeNode<K, V> tmp = LeftOf(replacementNode) ?? RightOf(replacementNode);
+            IntervalTreeNode<TKey, TValue> tmp = LeftOf(replacementNode) ?? RightOf(replacementNode);
 
             if (tmp != null)
             {
@@ -413,7 +413,7 @@ namespace Ryujinx.Common.Collections
 
         #endregion
 
-        protected override void RotateLeft(IntervalTreeNode<K, V> node)
+        protected override void RotateLeft(IntervalTreeNode<TKey, TValue> node)
         {
             if (node != null)
             {
@@ -423,7 +423,7 @@ namespace Ryujinx.Common.Collections
             }
         }
 
-        protected override void RotateRight(IntervalTreeNode<K, V> node)
+        protected override void RotateRight(IntervalTreeNode<TKey, TValue> node)
         {
             if (node != null)
             {
@@ -433,7 +433,7 @@ namespace Ryujinx.Common.Collections
             }
         }
 
-        public bool ContainsKey(K key)
+        public bool ContainsKey(TKey key)
         {
             ArgumentNullException.ThrowIfNull(key);
 
@@ -444,15 +444,15 @@ namespace Ryujinx.Common.Collections
     /// <summary>
     /// Represents a value and its start and end keys.
     /// </summary>
-    /// <typeparam name="K"></typeparam>
-    /// <typeparam name="V"></typeparam>
-    public readonly struct RangeNode<K, V>
+    /// <typeparam name="TKey"></typeparam>
+    /// <typeparam name="TValue"></typeparam>
+    public readonly struct RangeNode<TKey, TValue>
     {
-        public readonly K Start;
-        public readonly K End;
-        public readonly V Value;
+        public readonly TKey Start;
+        public readonly TKey End;
+        public readonly TValue Value;
 
-        public RangeNode(K start, K end, V value)
+        public RangeNode(TKey start, TKey end, TValue value)
         {
             Start = start;
             End = end;
@@ -463,36 +463,36 @@ namespace Ryujinx.Common.Collections
     /// <summary>
     /// Represents a node in the IntervalTree which contains start and end keys of type K, and a value of generic type V.
     /// </summary>
-    /// <typeparam name="K">Key type of the node</typeparam>
-    /// <typeparam name="V">Value type of the node</typeparam>
-    public class IntervalTreeNode<K, V> : IntrusiveRedBlackTreeNode<IntervalTreeNode<K, V>>
+    /// <typeparam name="TKey">Key type of the node</typeparam>
+    /// <typeparam name="TValue">Value type of the node</typeparam>
+    public class IntervalTreeNode<TKey, TValue> : IntrusiveRedBlackTreeNode<IntervalTreeNode<TKey, TValue>>
     {
         /// <summary>
         /// The start of the range.
         /// </summary>
-        internal K Start;
+        internal TKey Start;
 
         /// <summary>
         /// The end of the range - maximum of all in the Values list.
         /// </summary>
-        internal K End;
+        internal TKey End;
 
         /// <summary>
         /// The maximum end value of this node and all its children.
         /// </summary>
-        internal K Max;
+        internal TKey Max;
 
         /// <summary>
         /// Values contained on the node that shares a common Start value.
         /// </summary>
-        internal List<RangeNode<K, V>> Values;
+        internal List<RangeNode<TKey, TValue>> Values;
 
-        internal IntervalTreeNode(K start, K end, V value, IntervalTreeNode<K, V> parent)
+        internal IntervalTreeNode(TKey start, TKey end, TValue value, IntervalTreeNode<TKey, TValue> parent)
         {
             Start = start;
             End = end;
             Max = end;
-            Values = new List<RangeNode<K, V>> { new RangeNode<K, V>(start, end, value) };
+            Values = new List<RangeNode<TKey, TValue>> { new RangeNode<TKey, TValue>(start, end, value) };
             Parent = parent;
         }
     }
-- 
cgit v1.2.3