Fix code style errors.

nwn-dotnet · Jan 11, 2025 · c7a983c · c7a983c
1 parent b2d9bf5
commit c7a983c
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 22 deletions.
diff --git a/NWNX.NET.Tests/src/main/Async/MainThreadSynchronizationContext.cs b/NWNX.NET.Tests/src/main/Async/MainThreadSynchronizationContext.cs
@@ -55,17 +55,8 @@ public void Update()
       }
     }
 
-    private readonly struct QueuedTask
+    private readonly struct QueuedTask(SendOrPostCallback callback, object? state)
     {
-      private readonly SendOrPostCallback callback;
-      private readonly object? state;
-
-      public QueuedTask(SendOrPostCallback callback, object? state)
-      {
-        this.callback = callback;
-        this.state = state;
-      }
-
       public void Invoke()
       {
         try

diff --git a/NWNX.NET.Tests/src/main/Async/SynchronizationContextAwaiter.cs b/NWNX.NET.Tests/src/main/Async/SynchronizationContextAwaiter.cs
@@ -5,17 +5,10 @@ namespace NWNX.NET.Tests.Async
   /// <summary>
   /// Awaits for the current async context to return to the specified context.
   /// </summary>
-  internal readonly struct SynchronizationContextAwaiter : IAwaiter
+  internal readonly struct SynchronizationContextAwaiter(SynchronizationContext context) : IAwaiter
   {
     private static readonly SendOrPostCallback PostCallback = state => ((System.Action?)state)?.Invoke();
 
-    private readonly SynchronizationContext context;
-
-    public SynchronizationContextAwaiter(SynchronizationContext context)
-    {
-      this.context = context;
-    }
-
     public bool IsCompleted => context == SynchronizationContext.Current;
 
     public void GetResult() {}

diff --git a/NWNX.NET.Tests/src/main/Constants/VMFunctions.cs b/NWNX.NET.Tests/src/main/Constants/VMFunctions.cs
@@ -1,3 +1,5 @@
+// ReSharper disable InconsistentNaming
+
 namespace NWNX.NET.Tests.Constants
 {
   public static class VMFunctions

diff --git a/NWNX.NET.Tests/src/main/Program.cs b/NWNX.NET.Tests/src/main/Program.cs
@@ -10,7 +10,7 @@ public static unsafe class Program
     private static readonly MainThreadSynchronizationContext TestSyncContext = new MainThreadSynchronizationContext();
     private static readonly TestRunner TestRunner = new TestRunner(TestSyncContext);
 
-    public static event Action<ulong> OnMainLoop;
+    public static event Action<ulong>? OnMainLoop;
 
     public static void Main()
     {
@@ -40,7 +40,6 @@ private static void NWNXSignalHandler(IntPtr signalPtr)
           TestRunner.RunTestsAsync();
           break;
         case "ON_DESTROY_SERVER":
-          break;
         case "ON_DESTROY_SERVER_AFTER":
           break;
       }

diff --git a/NWNX.NET.Tests/src/main/TestRunner.cs b/NWNX.NET.Tests/src/main/TestRunner.cs
@@ -45,7 +45,7 @@ private void ExecuteTestRun()
       }
     }
 
-    private string[] GetRunnerArguments()
+    private static string[] GetRunnerArguments()
     {
       return ["--mainthread", $"--work={TestResultPath}"];
     }

diff --git a/NWNX.NET.Tests/src/main/Tests/Hooks/HookTests.cs b/NWNX.NET.Tests/src/main/Tests/Hooks/HookTests.cs
@@ -46,7 +46,7 @@ public async Task WriteLogFileDelegateHookTest()
       Assert.That(logMessage, Is.EqualTo(expectedMessage + "\n"));
     }
 
-    private unsafe void WriteLogFileDelegateHandler(void* pExoDebugInternal, void* pMessage)
+    private static unsafe void WriteLogFileDelegateHandler(void* pExoDebugInternal, void* pMessage)
     {
       callCount++;
       logMessage = StringUtils.ReadNullTerminatedString(CExoStringCStr(pMessage));

diff --git a/NWNX.NET.sln.DotSettings b/NWNX.NET.sln.DotSettings
@@ -665,6 +665,7 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=NWM/@EntryIndexedValue">NWM</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=NWNX/@EntryIndexedValue">NWNX</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=NWNXAPI/@EntryIndexedValue">NWNXAPI</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=NWNXVM/@EntryIndexedValue">NWNXVM</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=NWS/@EntryIndexedValue">NWS</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PC/@EntryIndexedValue">PC</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PLH/@EntryIndexedValue">PLH</s:String>

diff --git a/NWNX.NET/src/main/API/NWNXAPI.VM.cs b/NWNX.NET/src/main/API/NWNXAPI.VM.cs
@@ -53,6 +53,7 @@ public static partial class NWNXAPI
     /// <summary>
     /// VM Function. Push a game defined structure (pointer) to the current argument stack.
     /// </summary>
+    /// <param name="type">The engine structure type.</param>
     /// <param name="value">The value to push.</param>
     [LibraryImport("NWNX_DotNET", EntryPoint = "StackPushGameDefinedStructure")]
     [UnmanagedCallConv(CallConvs = [typeof(CallConvCdecl)])]
-Original file line number
+Diff line change
@@ Expand Up / @@ -45,7 +45,7 @@ private void ExecuteTestRun() @@
           }
         }
-        private string[] GetRunnerArguments()
+        private static string[] GetRunnerArguments()
         {
           return ["--mainthread", $"--work={TestResultPath}"];
         }
@@ Expand Down @@