[Ryujinx.HLE] Address dotnet-format issues (#5380)1.1.962

* 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 dotnet format CA1816 warnings * Address or silence dotnet format CA2208 warnings * Address or silence dotnet format CA1806 and a few CA1854 warnings * Address dotnet format CA2211 warnings * Address dotnet format CA1822 warnings * Address or silence dotnet format CA1069 warnings * Make dotnet format succeed in style mode * Address or silence dotnet format CA2211 warnings * Address review comments * Address dotnet format CA2208 warnings properly * Make ProcessResult readonly * 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 while and for-loops * Format if-blocks correctly * Run dotnet format style after rebase * 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 * Disable 'prefer switch expression' rule * Add comments to disabled warnings * Fix a few disabled warnings * Fix naming rule violation, Convert shader properties to auto-property and convert values to const * 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 * Run dotnet format after rebase * Use using declaration instead of block syntax * 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 * Fix naming rule violations * Fix typo * Add trailing commas, use targeted new and use array initializer * Fix build issues * Fix remaining build issues * Remove SuppressMessage for CA1069 where possible * Address dotnet format issues * Address formatting issues Co-authored-by: Ac_K <acoustik666@gmail.com> * Add GetHashCode implementation for RenderingSurfaceInfo * Explicitly silence CA1822 for every affected method in Syscall * Address formatting issues in Demangler.cs * Address review feedback Co-authored-by: Ac_K <acoustik666@gmail.com> * Revert marking service methods as static * Next dotnet format pass * Address review feedback --------- Co-authored-by: Ac_K <acoustik666@gmail.com>
author: TSRBerry <20988865+TSRBerry@users.noreply.github.com> 2023-07-16 19:31:14 +0200
committer: GitHub <noreply@github.com> 2023-07-16 19:31:14 +0200
commit: 326749498bed4360e5a4b11fc67d5ec7cb9a3076 (patch)
tree: ae21fb26f99b401ca4e9efaab72b679a81c22369 /src/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/InlineResponses.cs
parent: fec8291c17fa106c28f58b56419e90d49a41a1ea (diff)
1 files changed, 101 insertions, 118 deletions
diff --git a/src/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/InlineResponses.cs b/src/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/InlineResponses.cs
index c3e45d46..e8e57a48 100644
--- a/src/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/InlineResponses.cs
+++ b/src/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/InlineResponses.cs
@@ -60,55 +60,51 @@ namespace Ryujinx.HLE.HOS.Applets.SoftwareKeyboard
         {
             uint resSize = 2 * sizeof(uint) + 0x1;
 
-            using (MemoryStream stream = new MemoryStream(new byte[resSize]))
-            using (BinaryWriter writer = new BinaryWriter(stream))
-            {
-                BeginResponse(state, InlineKeyboardResponse.FinishedInitialize, writer);
-                writer.Write((byte)1); // Data (ignored by the program)
+            using MemoryStream stream = new(new byte[resSize]);
+            using BinaryWriter writer = new(stream);
 
-                return stream.ToArray();
-            }
+            BeginResponse(state, InlineKeyboardResponse.FinishedInitialize, writer);
+            writer.Write((byte)1); // Data (ignored by the program)
+
+            return stream.ToArray();
         }
 
         public static byte[] Default(InlineKeyboardState state)
         {
             uint resSize = 2 * sizeof(uint);
 
-            using (MemoryStream stream = new MemoryStream(new byte[resSize]))
-            using (BinaryWriter writer = new BinaryWriter(stream))
-            {
-                BeginResponse(state, InlineKeyboardResponse.Default, writer);
+            using MemoryStream stream = new(new byte[resSize]);
+            using BinaryWriter writer = new(stream);
 
-                return stream.ToArray();
-            }
+            BeginResponse(state, InlineKeyboardResponse.Default, writer);
+
+            return stream.ToArray();
         }
 
         public static byte[] ChangedString(string text, uint cursor, InlineKeyboardState state)
         {
             uint resSize = 6 * sizeof(uint) + MaxStrLenUTF16;
 
-            using (MemoryStream stream = new MemoryStream(new byte[resSize]))
-            using (BinaryWriter writer = new BinaryWriter(stream))
-            {
-                BeginResponse(state, InlineKeyboardResponse.ChangedString, writer);
-                WriteStringWithCursor(text, cursor, writer, MaxStrLenUTF16, Encoding.Unicode, true);
+            using MemoryStream stream = new(new byte[resSize]);
+            using BinaryWriter writer = new(stream);
 
-                return stream.ToArray();
-            }
+            BeginResponse(state, InlineKeyboardResponse.ChangedString, writer);
+            WriteStringWithCursor(text, cursor, writer, MaxStrLenUTF16, Encoding.Unicode, true);
+
+            return stream.ToArray();
         }
 
         public static byte[] MovedCursor(string text, uint cursor, InlineKeyboardState state)
         {
             uint resSize = 4 * sizeof(uint) + MaxStrLenUTF16;
 
-            using (MemoryStream stream = new MemoryStream(new byte[resSize]))
-            using (BinaryWriter writer = new BinaryWriter(stream))
-            {
-                BeginResponse(state, InlineKeyboardResponse.MovedCursor, writer);
-                WriteStringWithCursor(text, cursor, writer, MaxStrLenUTF16, Encoding.Unicode, false);
+            using MemoryStream stream = new(new byte[resSize]);
+            using BinaryWriter writer = new(stream);
 
-                return stream.ToArray();
-            }
+            BeginResponse(state, InlineKeyboardResponse.MovedCursor, writer);
+            WriteStringWithCursor(text, cursor, writer, MaxStrLenUTF16, Encoding.Unicode, false);
+
+            return stream.ToArray();
         }
 
         public static byte[] MovedTab(string text, uint cursor, InlineKeyboardState state)
@@ -117,182 +113,169 @@ namespace Ryujinx.HLE.HOS.Applets.SoftwareKeyboard
 
             uint resSize = 4 * sizeof(uint) + MaxStrLenUTF16;
 
-            using (MemoryStream stream = new MemoryStream(new byte[resSize]))
-            using (BinaryWriter writer = new BinaryWriter(stream))
-            {
-                BeginResponse(state, InlineKeyboardResponse.MovedTab, writer);
-                WriteStringWithCursor(text, cursor, writer, MaxStrLenUTF16, Encoding.Unicode, false);
+            using MemoryStream stream = new(new byte[resSize]);
+            using BinaryWriter writer = new(stream);
 
-                return stream.ToArray();
-            }
+            BeginResponse(state, InlineKeyboardResponse.MovedTab, writer);
+            WriteStringWithCursor(text, cursor, writer, MaxStrLenUTF16, Encoding.Unicode, false);
+
+            return stream.ToArray();
         }
 
         public static byte[] DecidedEnter(string text, InlineKeyboardState state)
         {
             uint resSize = 3 * sizeof(uint) + MaxStrLenUTF16;
 
-            using (MemoryStream stream = new MemoryStream(new byte[resSize]))
-            using (BinaryWriter writer = new BinaryWriter(stream))
-            {
-                BeginResponse(state, InlineKeyboardResponse.DecidedEnter, writer);
-                WriteString(text, writer, MaxStrLenUTF16, Encoding.Unicode);
+            using MemoryStream stream = new(new byte[resSize]);
+            using BinaryWriter writer = new(stream);
 
-                return stream.ToArray();
-            }
+            BeginResponse(state, InlineKeyboardResponse.DecidedEnter, writer);
+            WriteString(text, writer, MaxStrLenUTF16, Encoding.Unicode);
+
+            return stream.ToArray();
         }
 
         public static byte[] DecidedCancel(InlineKeyboardState state)
         {
             uint resSize = 2 * sizeof(uint);
 
-            using (MemoryStream stream = new MemoryStream(new byte[resSize]))
-            using (BinaryWriter writer = new BinaryWriter(stream))
-            {
-                BeginResponse(state, InlineKeyboardResponse.DecidedCancel, writer);
+            using MemoryStream stream = new(new byte[resSize]);
+            using BinaryWriter writer = new(stream);
 
-                return stream.ToArray();
-            }
+            BeginResponse(state, InlineKeyboardResponse.DecidedCancel, writer);
+
+            return stream.ToArray();
         }
 
         public static byte[] ChangedStringUtf8(string text, uint cursor, InlineKeyboardState state)
         {
             uint resSize = 6 * sizeof(uint) + MaxStrLenUTF8;
 
-            using (MemoryStream stream = new MemoryStream(new byte[resSize]))
-            using (BinaryWriter writer = new BinaryWriter(stream))
-            {
-                BeginResponse(state, InlineKeyboardResponse.ChangedStringUtf8, writer);
-                WriteStringWithCursor(text, cursor, writer, MaxStrLenUTF8, Encoding.UTF8, true);
+            using MemoryStream stream = new(new byte[resSize]);
+            using BinaryWriter writer = new(stream);
 
-                return stream.ToArray();
-            }
+            BeginResponse(state, InlineKeyboardResponse.ChangedStringUtf8, writer);
+            WriteStringWithCursor(text, cursor, writer, MaxStrLenUTF8, Encoding.UTF8, true);
+
+            return stream.ToArray();
         }
 
         public static byte[] MovedCursorUtf8(string text, uint cursor, InlineKeyboardState state)
         {
             uint resSize = 4 * sizeof(uint) + MaxStrLenUTF8;
 
-            using (MemoryStream stream = new MemoryStream(new byte[resSize]))
-            using (BinaryWriter writer = new BinaryWriter(stream))
-            {
-                BeginResponse(state, InlineKeyboardResponse.MovedCursorUtf8, writer);
-                WriteStringWithCursor(text, cursor, writer, MaxStrLenUTF8, Encoding.UTF8, false);
+            using MemoryStream stream = new(new byte[resSize]);
+            using BinaryWriter writer = new(stream);
 
-                return stream.ToArray();
-            }
+            BeginResponse(state, InlineKeyboardResponse.MovedCursorUtf8, writer);
+            WriteStringWithCursor(text, cursor, writer, MaxStrLenUTF8, Encoding.UTF8, false);
+
+            return stream.ToArray();
         }
 
         public static byte[] DecidedEnterUtf8(string text, InlineKeyboardState state)
         {
             uint resSize = 3 * sizeof(uint) + MaxStrLenUTF8;
 
-            using (MemoryStream stream = new MemoryStream(new byte[resSize]))
-            using (BinaryWriter writer = new BinaryWriter(stream))
-            {
-                BeginResponse(state, InlineKeyboardResponse.DecidedEnterUtf8, writer);
-                WriteString(text, writer, MaxStrLenUTF8, Encoding.UTF8);
+            using MemoryStream stream = new(new byte[resSize]);
+            using BinaryWriter writer = new(stream);
 
-                return stream.ToArray();
-            }
+            BeginResponse(state, InlineKeyboardResponse.DecidedEnterUtf8, writer);
+            WriteString(text, writer, MaxStrLenUTF8, Encoding.UTF8);
+
+            return stream.ToArray();
         }
 
         public static byte[] UnsetCustomizeDic(InlineKeyboardState state)
         {
             uint resSize = 2 * sizeof(uint);
 
-            using (MemoryStream stream = new MemoryStream(new byte[resSize]))
-            using (BinaryWriter writer = new BinaryWriter(stream))
-            {
-                BeginResponse(state, InlineKeyboardResponse.UnsetCustomizeDic, writer);
+            using MemoryStream stream = new(new byte[resSize]);
+            using BinaryWriter writer = new(stream);
 
-                return stream.ToArray();
-            }
+            BeginResponse(state, InlineKeyboardResponse.UnsetCustomizeDic, writer);
+
+            return stream.ToArray();
         }
 
         public static byte[] ReleasedUserWordInfo(InlineKeyboardState state)
         {
             uint resSize = 2 * sizeof(uint);
 
-            using (MemoryStream stream = new MemoryStream(new byte[resSize]))
-            using (BinaryWriter writer = new BinaryWriter(stream))
-            {
-                BeginResponse(state, InlineKeyboardResponse.ReleasedUserWordInfo, writer);
+            using MemoryStream stream = new(new byte[resSize]);
+            using BinaryWriter writer = new(stream);
 
-                return stream.ToArray();
-            }
+            BeginResponse(state, InlineKeyboardResponse.ReleasedUserWordInfo, writer);
+
+            return stream.ToArray();
         }
 
         public static byte[] UnsetCustomizedDictionaries(InlineKeyboardState state)
         {
             uint resSize = 2 * sizeof(uint);
 
-            using (MemoryStream stream = new MemoryStream(new byte[resSize]))
-            using (BinaryWriter writer = new BinaryWriter(stream))
-            {
-                BeginResponse(state, InlineKeyboardResponse.UnsetCustomizedDictionaries, writer);
+            using MemoryStream stream = new(new byte[resSize]);
+            using BinaryWriter writer = new(stream);
 
-                return stream.ToArray();
-            }
+            BeginResponse(state, InlineKeyboardResponse.UnsetCustomizedDictionaries, writer);
+
+            return stream.ToArray();
         }
 
         public static byte[] ChangedStringV2(string text, uint cursor, InlineKeyboardState state)
         {
             uint resSize = 6 * sizeof(uint) + MaxStrLenUTF16 + 0x1;
 
-            using (MemoryStream stream = new MemoryStream(new byte[resSize]))
-            using (BinaryWriter writer = new BinaryWriter(stream))
-            {
-                BeginResponse(state, InlineKeyboardResponse.ChangedStringV2, writer);
-                WriteStringWithCursor(text, cursor, writer, MaxStrLenUTF16, Encoding.Unicode, true);
-                writer.Write((byte)0); // Flag == 0
+            using MemoryStream stream = new(new byte[resSize]);
+            using BinaryWriter writer = new(stream);
 
-                return stream.ToArray();
-            }
+            BeginResponse(state, InlineKeyboardResponse.ChangedStringV2, writer);
+            WriteStringWithCursor(text, cursor, writer, MaxStrLenUTF16, Encoding.Unicode, true);
+            writer.Write((byte)0); // Flag == 0
+
+            return stream.ToArray();
         }
 
         public static byte[] MovedCursorV2(string text, uint cursor, InlineKeyboardState state)
         {
             uint resSize = 4 * sizeof(uint) + MaxStrLenUTF16 + 0x1;
 
-            using (MemoryStream stream = new MemoryStream(new byte[resSize]))
-            using (BinaryWriter writer = new BinaryWriter(stream))
-            {
-                BeginResponse(state, InlineKeyboardResponse.MovedCursorV2, writer);
-                WriteStringWithCursor(text, cursor, writer, MaxStrLenUTF16, Encoding.Unicode, false);
-                writer.Write((byte)0); // Flag == 0
+            using MemoryStream stream = new(new byte[resSize]);
+            using BinaryWriter writer = new(stream);
 
-                return stream.ToArray();
-            }
+            BeginResponse(state, InlineKeyboardResponse.MovedCursorV2, writer);
+            WriteStringWithCursor(text, cursor, writer, MaxStrLenUTF16, Encoding.Unicode, false);
+            writer.Write((byte)0); // Flag == 0
+
+            return stream.ToArray();
         }
 
         public static byte[] ChangedStringUtf8V2(string text, uint cursor, InlineKeyboardState state)
         {
             uint resSize = 6 * sizeof(uint) + MaxStrLenUTF8 + 0x1;
 
-            using (MemoryStream stream = new MemoryStream(new byte[resSize]))
-            using (BinaryWriter writer = new BinaryWriter(stream))
-            {
-                BeginResponse(state, InlineKeyboardResponse.ChangedStringUtf8V2, writer);
-                WriteStringWithCursor(text, cursor, writer, MaxStrLenUTF8, Encoding.UTF8, true);
-                writer.Write((byte)0); // Flag == 0
+            using MemoryStream stream = new(new byte[resSize]);
+            using BinaryWriter writer = new(stream);
 
-                return stream.ToArray();
-            }
+            BeginResponse(state, InlineKeyboardResponse.ChangedStringUtf8V2, writer);
+            WriteStringWithCursor(text, cursor, writer, MaxStrLenUTF8, Encoding.UTF8, true);
+            writer.Write((byte)0); // Flag == 0
+
+            return stream.ToArray();
         }
 
         public static byte[] MovedCursorUtf8V2(string text, uint cursor, InlineKeyboardState state)
         {
             uint resSize = 4 * sizeof(uint) + MaxStrLenUTF8 + 0x1;
 
-            using (MemoryStream stream = new MemoryStream(new byte[resSize]))
-            using (BinaryWriter writer = new BinaryWriter(stream))
-            {
-                BeginResponse(state, InlineKeyboardResponse.MovedCursorUtf8V2, writer);
-                WriteStringWithCursor(text, cursor, writer, MaxStrLenUTF8, Encoding.UTF8, false);
-                writer.Write((byte)0); // Flag == 0
+            using MemoryStream stream = new(new byte[resSize]);
+            using BinaryWriter writer = new(stream);
 
-                return stream.ToArray();
-            }
+            BeginResponse(state, InlineKeyboardResponse.MovedCursorUtf8V2, writer);
+            WriteStringWithCursor(text, cursor, writer, MaxStrLenUTF8, Encoding.UTF8, false);
+            writer.Write((byte)0); // Flag == 0
+
+            return stream.ToArray();
         }
     }
 }
author	TSRBerry <20988865+TSRBerry@users.noreply.github.com>	2023-07-16 19:31:14 +0200
committer	GitHub <noreply@github.com>	2023-07-16 19:31:14 +0200
commit	326749498bed4360e5a4b11fc67d5ec7cb9a3076 (patch)
tree	ae21fb26f99b401ca4e9efaab72b679a81c22369 /src/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/InlineResponses.cs
parent	fec8291c17fa106c28f58b56419e90d49a41a1ea (diff)