From 02b5c7ea89bb6aae1c214b78fb1047872382dc43 Mon Sep 17 00:00:00 2001
From: TSRBerry <20988865+TSRBerry@users.noreply.github.com>
Date: Sat, 1 Jul 2023 12:42:10 +0200
Subject: [Ryujinx.Horizon] Address dotnet-format issues (#5381)

* 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 dotnet format CA1822 warnings

* 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

* Run dotnet format whitespace after rebase

* Run dotnet format style after rebase

* Run dotnet format after rebase and remove unused usings

- analyzers
- style
- whitespace

* Add comments to disabled warnings

* Remove a few unused parameters

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

* Address IDE0251 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

* Add trailing commas and fix formatting issues

* Convert if-else chain to switch block

* Address review feedback
---
 src/Ryujinx.Horizon/Sdk/Sm/IManagerService.cs | 2 +-
 src/Ryujinx.Horizon/Sdk/Sm/IUserService.cs    | 2 +-
 src/Ryujinx.Horizon/Sdk/Sm/ServiceName.cs     | 6 +++---
 src/Ryujinx.Horizon/Sdk/Sm/SmApi.cs           | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/Ryujinx.Horizon/Sdk/Sm')

diff --git a/src/Ryujinx.Horizon/Sdk/Sm/IManagerService.cs b/src/Ryujinx.Horizon/Sdk/Sm/IManagerService.cs
index 64428583..2343c7d6 100644
--- a/src/Ryujinx.Horizon/Sdk/Sm/IManagerService.cs
+++ b/src/Ryujinx.Horizon/Sdk/Sm/IManagerService.cs
@@ -5,4 +5,4 @@ namespace Ryujinx.Horizon.Sdk.Sm
     interface IManagerService : IServiceObject
     {
     }
-}
\ No newline at end of file
+}
diff --git a/src/Ryujinx.Horizon/Sdk/Sm/IUserService.cs b/src/Ryujinx.Horizon/Sdk/Sm/IUserService.cs
index ad9bc9d7..8605cdd1 100644
--- a/src/Ryujinx.Horizon/Sdk/Sm/IUserService.cs
+++ b/src/Ryujinx.Horizon/Sdk/Sm/IUserService.cs
@@ -10,4 +10,4 @@ namespace Ryujinx.Horizon.Sdk.Sm
         Result RegisterService(out int handle, ServiceName name, int maxSessions, bool isLight);
         Result UnregisterService(ServiceName name);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Ryujinx.Horizon/Sdk/Sm/ServiceName.cs b/src/Ryujinx.Horizon/Sdk/Sm/ServiceName.cs
index 9b7fae3f..f90d39c2 100644
--- a/src/Ryujinx.Horizon/Sdk/Sm/ServiceName.cs
+++ b/src/Ryujinx.Horizon/Sdk/Sm/ServiceName.cs
@@ -4,13 +4,13 @@ using System.Runtime.InteropServices;
 namespace Ryujinx.Horizon.Sdk.Sm
 {
     [StructLayout(LayoutKind.Sequential, Pack = 1)]
-    struct ServiceName
+    readonly struct ServiceName
     {
-        public static ServiceName Invalid { get; } = new ServiceName(0);
+        public static ServiceName Invalid { get; } = new(0);
 
         public bool IsValid => Packed != 0;
 
-        public int Length => sizeof(ulong);
+        public const int Length = sizeof(ulong);
 
         public ulong Packed { get; }
 
diff --git a/src/Ryujinx.Horizon/Sdk/Sm/SmApi.cs b/src/Ryujinx.Horizon/Sdk/Sm/SmApi.cs
index 533e68d9..3e5635bf 100644
--- a/src/Ryujinx.Horizon/Sdk/Sm/SmApi.cs
+++ b/src/Ryujinx.Horizon/Sdk/Sm/SmApi.cs
@@ -110,4 +110,4 @@ namespace Ryujinx.Horizon.Sdk.Sm
             return ServiceUtil.SendRequest(out _, _portHandle, 4, sendPid: true, data);
         }
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3