Merge pull request #418 from BUTR/code-formatting/fix-codeformatting

Automated PR to fix formatting errors
BUTR · Oct 5, 2024 · 7acb549 · 7acb549
2 parents 7e540cf + 3e3ca16
commit 7acb549
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 30 deletions.
diff --git a/src/Bannerlord.ButterLib.Implementation/SaveSystem/Patches/DefinitionContextPatch.cs b/src/Bannerlord.ButterLib.Implementation/SaveSystem/Patches/DefinitionContextPatch.cs
@@ -61,15 +61,15 @@ internal static bool Disable(Harmony harmony)
 
     private static readonly Patch[] Patches =
     [
-        new PrefixPatch(nameof(AddBasicTypeDefinitionPrefix),     TargetTypeMethod("AddBasicTypeDefinition")),
-        new PrefixPatch(nameof(AddClassDefinitionPrefix),         TargetTypeMethod("AddClassDefinition")),
-        new PrefixPatch(nameof(AddContainerDefinitionPrefix),     TargetTypeMethod("AddContainerDefinition")),
-        new PrefixPatch(nameof(AddEnumDefinitionPrefix),          TargetTypeMethod("AddEnumDefinition")),
-        new PrefixPatch(nameof(AddGenericClassDefinitionPrefix),  TargetTypeMethod("AddGenericClassDefinition")),
+        new PrefixPatch(nameof(AddBasicTypeDefinitionPrefix), TargetTypeMethod("AddBasicTypeDefinition")),
+        new PrefixPatch(nameof(AddClassDefinitionPrefix), TargetTypeMethod("AddClassDefinition")),
+        new PrefixPatch(nameof(AddContainerDefinitionPrefix), TargetTypeMethod("AddContainerDefinition")),
+        new PrefixPatch(nameof(AddEnumDefinitionPrefix), TargetTypeMethod("AddEnumDefinition")),
+        new PrefixPatch(nameof(AddGenericClassDefinitionPrefix), TargetTypeMethod("AddGenericClassDefinition")),
         new PrefixPatch(nameof(AddGenericStructDefinitionPrefix), TargetTypeMethod("AddGenericStructDefinition")),
-        new PrefixPatch(nameof(AddInterfaceDefinitionPrefix),     TargetTypeMethod("AddInterfaceDefinition")),
-        new PrefixPatch(nameof(AddRootClassDefinitionPrefix),     TargetTypeMethod("AddRootClassDefinition")),
-        new PrefixPatch(nameof(AddStructDefinitionPrefix),        TargetTypeMethod("AddStructDefinition")),
+        new PrefixPatch(nameof(AddInterfaceDefinitionPrefix), TargetTypeMethod("AddInterfaceDefinition")),
+        new PrefixPatch(nameof(AddRootClassDefinitionPrefix), TargetTypeMethod("AddRootClassDefinition")),
+        new PrefixPatch(nameof(AddStructDefinitionPrefix), TargetTypeMethod("AddStructDefinition")),
         new ConstructContainerDefinitionPrefixPatch()
     ];
 

diff --git a/src/Bannerlord.ButterLib/ExceptionHandler/ExceptionHandlerSubSystem.cs b/src/Bannerlord.ButterLib/ExceptionHandler/ExceptionHandlerSubSystem.cs
@@ -6,12 +6,13 @@
 using HarmonyLib;
 using HarmonyLib.BUTR.Extensions;
 
+using JetBrains.Annotations;
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.ExceptionServices;
 using System.Security;
-using JetBrains.Annotations;
 
 namespace Bannerlord.ButterLib.ExceptionHandler;
 

diff --git a/src/Bannerlord.ButterLib/ExceptionHandler/ExceptionReporter.cs b/src/Bannerlord.ButterLib/ExceptionHandler/ExceptionReporter.cs
@@ -53,29 +53,29 @@ public static void Show(Exception exception)
         var harmonyProvider = new HarmonyProvider();
         var crashReportRendererUtilities = new CrashReportRendererUtilities();
 
-            var crashReport = CrashReportInfo.Create(exception, metadata, filter, helper, helper, helper, harmonyProvider);
-            var crashReportModel = CrashReportInfo.ToModel(crashReport, helper, helper, helper, helper, helper, helper);
-            var logSources = GetLogSources().ToArray();
+        var crashReport = CrashReportInfo.Create(exception, metadata, filter, helper, helper, helper, harmonyProvider);
+        var crashReportModel = CrashReportInfo.ToModel(crashReport, helper, helper, helper, helper, helper, helper);
+        var logSources = GetLogSources().ToArray();
+        try
+        {
+            CrashReportImGui.ShowAndWait(crashReportModel, logSources, crashReportRendererUtilities);
+        }
+        catch (Exception ex)
+        {
             try
             {
-                CrashReportImGui.ShowAndWait(crashReportModel, logSources, crashReportRendererUtilities);
-            }
-            catch (Exception ex)
-            {
-                try
-                {
 #if NET472 || (NET6_0 && WINDOWS)
 
-                    var forms = new CrashReportWinForms(crashReportModel, logSources, crashReportRendererUtilities);
-                    forms.ShowDialog();
+                var forms = new CrashReportWinForms(crashReportModel, logSources, crashReportRendererUtilities);
+                forms.ShowDialog();
 #endif
-                }
-                catch (Exception ex2)
-                {
-                    throw new AggregateException(ex, ex2);
-                }
+            }
+            catch (Exception ex2)
+            {
+                throw new AggregateException(ex, ex2);
             }
         }
+    }
 
     private static IEnumerable<LogSource> GetLogSources()
     {

diff --git a/src/Bannerlord.ButterLib/ExceptionHandler/Utils/CreatorZip.cs b/src/Bannerlord.ButterLib/ExceptionHandler/Utils/CreatorZip.cs
@@ -1,4 +1,4 @@
-using BUTR.CrashReport.Models;
+using BUTR.CrashReport.Models;
 using BUTR.CrashReport.Renderer.Zip;
 
 using Newtonsoft.Json;

diff --git a/src/Bannerlord.ButterLib/ExceptionHandler/Utils/MiniDump.cs b/src/Bannerlord.ButterLib/ExceptionHandler/Utils/MiniDump.cs
@@ -117,7 +117,7 @@ public enum MINIDUMP_CALLBACK_TYPE
             ReadMemoryFailureCallback,
             SecondaryFlagsCallback
         }
-        
+
         public struct VS_FIXEDFILEINFO
         {
 #pragma warning disable CS0649 // Field is never assigned to, and will always have its default value
@@ -194,7 +194,7 @@ public struct MINIDUMP_INCLUDE_MODULE_CALLBACK
             public ulong BaseOfImage;
 #pragma warning restore CS0649 // Field is never assigned to, and will always have its default value
         }
-        
+
         public struct MINIDUMP_IO_CALLBACK
         {
 #pragma warning disable CS0649 // Field is never assigned to, and will always have its default value
@@ -204,7 +204,7 @@ public struct MINIDUMP_IO_CALLBACK
             public uint BufferBytes;
 #pragma warning restore CS0649 // Field is never assigned to, and will always have its default value
         }
-        
+
         public struct MINIDUMP_CALLBACK_INPUT
         {
             [StructLayout(LayoutKind.Explicit)]
@@ -225,7 +225,7 @@ public struct UNION
                 [FieldOffset(0)]
                 public MINIDUMP_IO_CALLBACK Io;
             }
-            
+
 #pragma warning disable CS0649 // Field is never assigned to, and will always have its default value
             public uint ProcessId;
             public IntPtr ProcessHandle;