adds shortcuts for some API functions, cleans code and applies C#12 s…

…yntax upgrades

.editorconfig

@@ -37,9 +37,9 @@ dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggesti
 csharp_style_var_for_built_in_types = true:suggestion
 csharp_style_var_when_type_is_apparent = true:suggestion
 csharp_style_var_elsewhere = true:suggestion
-csharp_style_expression_bodied_methods = false:suggestion
-csharp_style_expression_bodied_constructors = false:suggestion
-csharp_style_expression_bodied_operators = false:suggestion
+csharp_style_expression_bodied_methods = when_on_single_line:suggestion
+csharp_style_expression_bodied_constructors = when_on_single_line:suggestion
+csharp_style_expression_bodied_operators = when_on_single_line:suggestion
 csharp_style_expression_bodied_properties = true:suggestion
 csharp_style_expression_bodied_indexers = true:suggestion
 csharp_style_expression_bodied_accessors = true:suggestion
@@ -78,6 +78,7 @@ csharp_style_prefer_method_group_conversion = true:silent
 csharp_style_prefer_top_level_statements = true:silent
 csharp_style_expression_bodied_lambdas = when_on_single_line:silent
 csharp_style_expression_bodied_local_functions = when_on_single_line:silent
+csharp_style_prefer_primary_constructors = true:suggestion
 
 [*.{cs,vb}]
 #### Naming styles ####
@@ -141,3 +142,4 @@ dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
 dotnet_style_operator_placement_when_wrapping = beginning_of_line
 tab_width = 3
 indent_size = 3
+dotnet_style_allow_statement_immediately_after_block_experimental = true:silent

Harmony/Documentation/GlobalSuppressions.cs

@@ -17,6 +17,7 @@
 
 [assembly: SuppressMessage("Performance", "CA1822")]
 [assembly: SuppressMessage("Performance", "CA1806")]
+[assembly: SuppressMessage("Performance", "CA1859")]
 
 [assembly: SuppressMessage("", "CS0649")]
 [assembly: SuppressMessage("", "IDE0251")]

Harmony/Documentation/examples/execution_with.cs

@@ -2,6 +2,7 @@ namespace Execution_With
 {
 	using System;
 
+#pragma warning disable CS9113
 	public class Code
 	{
 		// <example>
@@ -69,13 +70,14 @@ static R ReplacementMethod(T optionalThisArgument /*, ... arguments ... */ )
 		}
 
 		// given the following signatures:
-		public static R Original() { return new R("original"); }
+		public static R Original() => new("original");
 		public static void SimpleFinalizer(ref R result) { }
-		public static Exception EditFinalizer(Exception ex, ref R result) { return ex; }
+		public static Exception EditFinalizer(Exception ex, ref R result) => ex;
 		// </example>
 
-		public class R { public R(string s) { } }
+		public class R(string s) { }
 		public class T { }
 		public static bool allVoid;
 	}
+#pragma warning restore CS9113
 }

Harmony/Documentation/examples/execution_without.cs

@@ -47,13 +47,13 @@ class R { }
 		static int someArgument;
 
 		static void SimplePrefix1(params object[] arguments) { }
-		static bool Prefix2() { return true; }
+		static bool Prefix2() => true;
 		static void SimplePrefix3(params object[] arguments) { }
 		static void SimplePrefix4(params object[] arguments) { }
-		static bool Prefix5(ref int i, ref R r) { return true; }
-		static R ModifiedOriginal(params object[] arguments) { return null; }
+		static bool Prefix5(ref int i, ref R r) => true;
+		static R ModifiedOriginal(params object[] arguments) => null;
 		static void Postfix1(ref R r) { }
-		static R Postfix2(R r, params object[] arguments) { return r; }
+		static R Postfix2(R r, params object[] arguments) => r;
 		static void Postfix3() { }
 	}
 }

Harmony/Documentation/examples/intro_annotations.cs

@@ -36,10 +36,7 @@ static bool Prefix(SomeGameClass __instance, ref int ___counter)
 			return true;
 		}
 
-		static void Postfix(ref int __result)
-		{
-			__result *= 2;
-		}
+		static void Postfix(ref int __result) => __result *= 2;
 	}
 	// </example>
 }

Harmony/Documentation/examples/patching-edgecases.cs

@@ -11,7 +11,7 @@ class Patch
 		[HarmonyReversePatch]
 		[HarmonyPatch(typeof(BaseClass), nameof(BaseClass.Method))]
 		[MethodImpl(MethodImplOptions.NoInlining)]
-		static string BaseMethodDummy(SubClass instance) { return null; }
+		static string BaseMethodDummy(SubClass instance) => null;
 
 		[HarmonyPatch(typeof(SubClass), nameof(SubClass.Method))]
 		static void Prefix(SubClass __instance)
@@ -23,18 +23,12 @@ static void Prefix(SubClass __instance)
 
 	public class BaseClass
 	{
-		public virtual string Method()
-		{
-			return "base";
-		}
+		public virtual string Method() => "base";
 	}
 
 	public class SubClass : BaseClass
 	{
-		public override string Method()
-		{
-			return "subclass";
-		}
+		public override string Method() => "subclass";
 	}
 	// </example>
 
@@ -67,15 +61,9 @@ class SomeGameObject
 	{
 		GameObject gameObject;
 
-		void SomeMethod()
-		{
-			UnityEngine.Object.DontDestroyOnLoad(gameObject);
-		}
+		void SomeMethod() => UnityEngine.Object.DontDestroyOnLoad(gameObject);
 
-		void SomeOtherMethod()
-		{
-			SomeMethod();
-		}
+		void SomeOtherMethod() => SomeMethod();
 	}
 	// </early1>
 #pragma warning restore CS0649
@@ -85,11 +73,9 @@ public static class Patcher
 	{
 		private static bool patched = false;
 
-		public static void Main()
-		{
+		public static void Main() =>
 			//DoPatch(); <-- Do not execute patching on assembly entry point
 			SceneManager.sceneLoaded += SceneLoaded;
-		}
 
 		private static void DoPatch()
 		{

Harmony/Documentation/examples/patching-finalizer.cs

@@ -15,16 +15,10 @@ public class MyException : Exception
 			public MyException() { }
 			public MyException(string message) : base(message) { }
 			public MyException(string message, Exception innerException) : base(message, innerException) { }
-			protected MyException(SerializationInfo serializationInfo, StreamingContext streamingContext)
-			{
-				throw new NotImplementedException();
-			}
+			protected MyException(SerializationInfo serializationInfo, StreamingContext streamingContext) => throw new NotImplementedException();
 		}
 
-		static Exception Finalizer(Exception __exception)
-		{
-			return new MyException("Oops", __exception);
-		}
+		static Exception Finalizer(Exception __exception) => new MyException("Oops", __exception);
 		// </rethrow>
 	}
 }

Harmony/Documentation/examples/patching-postfix.cs

@@ -8,10 +8,7 @@ public class ResultExample
 		// <result>
 		public class OriginalCode
 		{
-			public string GetName()
-			{
-				return name; // ...
-			}
+			public string GetName() => name; // ...
 		}
 
 		[HarmonyPatch(typeof(OriginalCode), nameof(OriginalCode.GetName))]
@@ -33,10 +30,7 @@ public class PassThroughExample
 		// <passthrough>
 		public class OriginalCode
 		{
-			public string GetName()
-			{
-				return "David";
-			}
+			public string GetName() => "David";
 
 			public IEnumerable<int> GetNumbers()
 			{
@@ -49,10 +43,7 @@ public IEnumerable<int> GetNumbers()
 		[HarmonyPatch(typeof(OriginalCode), nameof(OriginalCode.GetName))]
 		class Patch1
 		{
-			static string Postfix(string name)
-			{
-				return "Hello " + name;
-			}
+			static string Postfix(string name) => "Hello " + name;
 		}
 
 		[HarmonyPatch(typeof(OriginalCode), nameof(OriginalCode.GetNumbers))]
@@ -86,10 +77,7 @@ public void Test(int counter)
 		[HarmonyPatch(typeof(OriginalCode), nameof(OriginalCode.Test))]
 		class Patch
 		{
-			static void Prefix(int counter)
-			{
-				FileLog.Log("counter = " + counter);
-			}
+			static void Prefix(int counter) => FileLog.Log("counter = " + counter);
 		}
 		// </args>
 	}

Harmony/Documentation/examples/patching-prefix.cs

@@ -31,10 +31,7 @@ public class SkipExample
 		// <skip>
 		public class OriginalCode
 		{
-			public string GetName()
-			{
-				return name; // ...
-			}
+			public string GetName() => name; // ...
 		}
 
 		[HarmonyPatch(typeof(OriginalCode), nameof(OriginalCode.GetName))]
@@ -56,10 +53,7 @@ public class SkipMaybeExample
 		// <skip_maybe>
 		public class OriginalCode
 		{
-			public bool IsFullAfterTakingIn(int i)
-			{
-				return DoSomeExpensiveCalculation() > i;
-			}
+			public bool IsFullAfterTakingIn(int i) => DoSomeExpensiveCalculation() > i;
 		}
 
 		[HarmonyPatch(typeof(OriginalCode), nameof(OriginalCode.IsFullAfterTakingIn))]
@@ -77,7 +71,7 @@ static bool Prefix(ref bool __result, int i)
 		}
 		// </skip_maybe>
 
-		static int DoSomeExpensiveCalculation() { return 0; }
+		static int DoSomeExpensiveCalculation() => 0;
 	}
 
 	public class StateExample

Harmony/Documentation/examples/patching-transpiler.cs

@@ -36,7 +36,7 @@ class SomeType { public string someField; }
 
 		class Tools
 		{
-			public static MethodInfo MyExtraMethod() { return null; }
+			public static MethodInfo MyExtraMethod() => null;
 		}
 
 		static void ReportError(string s) { }

Harmony/Documentation/examples/priorities.cs

@@ -6,10 +6,7 @@ namespace Priorities
 	// <foo>
 	class Foo
 	{
-		static string Bar()
-		{
-			return "secret";
-		}
+		static string Bar() => "secret";
 	}
 	// </foo>
 
@@ -26,10 +23,7 @@ void Main_Plugin1()
 		[HarmonyPatch("Bar")]
 		class MyPatch
 		{
-			static void Postfix(ref string result)
-			{
-				result = "new secret 1";
-			}
+			static void Postfix(ref string result) => result = "new secret 1";
 		}
 		// </plugin1>
 	}
@@ -48,10 +42,7 @@ void Main_Plugin1b()
 		class MyPatch
 		{
 			[HarmonyAfter(["net.example.plugin2"])]
-			static void Postfix(ref string result)
-			{
-				result = "new secret 1";
-			}
+			static void Postfix(ref string result) => result = "new secret 1";
 		}
 		// </plugin1b>
 	}
@@ -69,10 +60,7 @@ void Main_Plugin2()
 		[HarmonyPatch("Bar")]
 		class MyPatch
 		{
-			static void Postfix(ref string result)
-			{
-				result = "new secret 2";
-			}
+			static void Postfix(ref string result) => result = "new secret 2";
 		}
 		// </plugin2>
 	}

Harmony/Documentation/examples/reverse-patching.cs

@@ -23,20 +23,16 @@ public class Patch
 		{
 			[HarmonyReversePatch]
 			[HarmonyPatch(typeof(OriginalCode), "Test")]
-			public static void MyTest(object instance, int counter, string name)
-			{
+			public static void MyTest(object instance, int counter, string name) =>
 				// its a stub so it has no initial content
 				throw new NotImplementedException("It's a stub");
-			}
 		}
 
 		class Main
 		{
-			void Test()
-			{
+			void Test() =>
 				// here we call OriginalCode.Test()
 				Patch.MyTest(originalInstance, 100, "hello");
-			}
 		}
 		// </example>
 

Harmony/Documentation/examples/utilities.cs

@@ -12,10 +12,7 @@ struct Bar
 			{
 				static string secret = "hello";
 
-				public string ModifiedSecret()
-				{
-					return secret.ToUpper();
-				}
+				public string ModifiedSecret() => secret.ToUpper();
 			}
 
 			Bar MyBar
@@ -26,19 +23,13 @@ Bar MyBar
 				}
 			}
 
-			public string GetSecret()
-			{
-				return MyBar.ModifiedSecret();
-			}
+			public string GetSecret() => MyBar.ModifiedSecret();
 
 			Foo()
 			{
 			}
 
-			static Foo MakeFoo()
-			{
-				return new Foo();
-			}
+			static Foo MakeFoo() => new();
 		}
 
 		void Test()

Harmony/Extras/FastAccess.cs

@@ -43,7 +43,7 @@ public static InstantiationHandler<T> CreateInstantiationHandler<T>()
 		{
 			var constructorInfo =
 				typeof(T).GetConstructor(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance, null,
-					new Type[0], null);
+					[], null);
 			if (constructorInfo is null)
 			{
 				throw new ApplicationException(string.Format(
@@ -162,14 +162,8 @@ public static SetterHandler<T, S> CreateSetterHandler<T, S>(FieldInfo fieldInfo)
 			return (SetterHandler<T, S>)dynamicSet.Generate().CreateDelegate(typeof(SetterHandler<T, S>));
 		}
 
-		static DynamicMethodDefinition CreateGetDynamicMethod<T, S>(Type type)
-		{
-			return new DynamicMethodDefinition($"DynamicGet_{type.Name}", typeof(S), [typeof(T)]);
-		}
+		static DynamicMethodDefinition CreateGetDynamicMethod<T, S>(Type type) => new($"DynamicGet_{type.Name}", typeof(S), [typeof(T)]);
 
-		static DynamicMethodDefinition CreateSetDynamicMethod<T, S>(Type type)
-		{
-			return new DynamicMethodDefinition($"DynamicSet_{type.Name}", typeof(void), [typeof(T), typeof(S)]);
-		}
+		static DynamicMethodDefinition CreateSetDynamicMethod<T, S>(Type type) => new($"DynamicSet_{type.Name}", typeof(void), [typeof(T), typeof(S)]);
 	}
 }