From ff53dcf5607a82ad38388502b4cf5cc8cca77733 Mon Sep 17 00:00:00 2001
From: TSRBerry <20988865+TSRBerry@users.noreply.github.com>
Date: Mon, 26 Jun 2023 07:25:06 +0200
Subject: [ARMeilleure] Address dotnet-format issues (#5357)

* 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 IDE0052 warnings

* Address or silence dotnet format IDE1006 warnings

* Address or silence dotnet format CA2208 warnings

* Address dotnet format CA1822 warnings

* Address or silence dotnet format CA1069 warnings

* Silence CA1806 and CA1834 issues

* Address dotnet format CA1401 warnings

* Fix new dotnet-format issues after rebase

* Address review comments

* Address dotnet format CA2208 warnings properly

* 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

* Add previously silenced warnings back

I have no clue how these disappeared

* Revert formatting changes for OpCodeTable.cs

* Enable formatting for a few cases again

* Format if-blocks correctly

* Enable formatting for a few more cases again

* Fix inline comment alignment

* Run dotnet format after rebase and remove unused usings

- analyzers
- style
- whitespace

* Disable 'prefer switch expression' rule

* Add comments to disabled warnings

* Remove a few unused parameters

* Adjust namespaces

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

* Start working on disabled warnings

* Fix and silence a few dotnet-format warnings again

* Address IDE0251 warnings

* Address a few disabled IDE0060 warnings

* Silence IDE0060 in .editorconfig

* 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

* Remove unnecessary formatting exclusion

* Add unsafe dotnet format changes

* Change visibility of JitSupportDarwin to internal
---
 src/ARMeilleure/Translation/ArmEmitterContext.cs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'src/ARMeilleure/Translation/ArmEmitterContext.cs')

diff --git a/src/ARMeilleure/Translation/ArmEmitterContext.cs b/src/ARMeilleure/Translation/ArmEmitterContext.cs
index 565d2aad..e2407473 100644
--- a/src/ARMeilleure/Translation/ArmEmitterContext.cs
+++ b/src/ARMeilleure/Translation/ArmEmitterContext.cs
@@ -55,7 +55,7 @@ namespace ARMeilleure.Translation
         public Aarch32Mode Mode { get; }
 
         private int _ifThenBlockStateIndex = 0;
-        private Condition[] _ifThenBlockState = { };
+        private Condition[] _ifThenBlockState = Array.Empty<Condition>();
         public bool IsInIfThenBlock => _ifThenBlockStateIndex < _ifThenBlockState.Length;
         public Condition CurrentIfThenBlockCond => _ifThenBlockState[_ifThenBlockStateIndex];
 
@@ -96,7 +96,7 @@ namespace ARMeilleure.Translation
 
                 OperandType returnType = GetOperandType(info.ReturnType);
 
-                Symbol symbol = new Symbol(SymbolType.DelegateTable, (ulong)index);
+                Symbol symbol = new(SymbolType.DelegateTable, (ulong)index);
 
                 Symbols.Add((ulong)funcPtr.ToInt64(), info.Name);
 
@@ -219,6 +219,7 @@ namespace ARMeilleure.Translation
             {
                 switch (condition)
                 {
+#pragma warning disable IDE0055 // Disable formatting
                     case Condition.Eq:   return ICompareEqual           (n, m);
                     case Condition.Ne:   return ICompareNotEqual        (n, m);
                     case Condition.GeUn: return ICompareGreaterOrEqualUI(n, m);
@@ -229,6 +230,7 @@ namespace ARMeilleure.Translation
                     case Condition.Lt:   return ICompareLess            (n, m);
                     case Condition.Gt:   return ICompareGreater         (n, m);
                     case Condition.Le:   return ICompareLessOrEqual     (n, m);
+#pragma warning restore IDE0055
                 }
             }
             else if (cmpName == InstName.Adds && _optOpLastCompare is IOpCodeAluImm op)
@@ -253,12 +255,14 @@ namespace ARMeilleure.Translation
 
                 switch (condition)
                 {
+#pragma warning disable IDE0055 // Disable formatting
                     case Condition.Eq: return ICompareEqual         (n, m);
                     case Condition.Ne: return ICompareNotEqual      (n, m);
                     case Condition.Ge: return ICompareGreaterOrEqual(n, m);
                     case Condition.Lt: return ICompareLess          (n, m);
                     case Condition.Gt: return ICompareGreater       (n, m);
                     case Condition.Le: return ICompareLessOrEqual   (n, m);
+#pragma warning restore IDE0055
                 }
             }
 
@@ -279,4 +283,4 @@ namespace ARMeilleure.Translation
             }
         }
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3