.

Author: SimonCropp

ConfigureAwait.Fody/AsyncStateMachineKind.cs

@@ -0,0 +1,6 @@
+enum AsyncStateMachineKind
+{
+    None,
+    StateMachine,
+    CompilerService
+}

ConfigureAwait.Fody/AttributeCleaner.cs

@@ -1,6 +1,4 @@
-using Mono.Cecil;
-
-static class AttributeCleaner
+static class AttributeCleaner
 {
     public static void Run(ModuleDefinition module)
     {

ConfigureAwait.Fody/CecilExtensions.cs

@@ -1,15 +1,4 @@
-using Fody;
-using Mono.Cecil;
-using Mono.Cecil.Cil;
-
-enum AsyncStateMachineKind
-{
-    None,
-    StateMachine,
-    CompilerService
-}
-
-static class CecilExtensions
+static class CecilExtensions
 {
     // Not yet defined in Cecil, remove later when update is available.
     const MethodImplAttributes MethodImplAttributes_Async = (MethodImplAttributes)0x2000;
@@ -22,7 +11,7 @@ public static bool IsIAsyncStateMachine(this TypeDefinition type)
         }
 
         return type.Interfaces
-            .Any(item => item.InterfaceType.FullName == "System.Runtime.CompilerServices.IAsyncStateMachine");
+            .Any(_ => _.InterfaceType.FullName == "System.Runtime.CompilerServices.IAsyncStateMachine");
     }
 
     public static MethodDefinition Method(this TypeDefinition type, MethodReference reference)
@@ -63,10 +52,14 @@ static bool IsAsyncStateMachineAttribute(this CustomAttribute attribute)
     public static AsyncStateMachineKind GetAsyncStateMachineKind(this MethodDefinition method)
     {
         if (method.CustomAttributes.Any(IsAsyncStateMachineAttribute))
+        {
             return AsyncStateMachineKind.StateMachine;
+        }
 
         if (method.ImplAttributes.HasFlag(MethodImplAttributes_Async))
+        {
             return AsyncStateMachineKind.CompilerService;
+        }
 
         return AsyncStateMachineKind.None;
     }

ConfigureAwait.Fody/GlobalUsings.cs

@@ -0,0 +1,7 @@
+// Global using directives
+
+global using System.Xml;
+global using Fody;
+global using Mono.Cecil;
+global using Mono.Cecil.Cil;
+global using Mono.Cecil.Rocks;

ConfigureAwait.Fody/ModuleWeaver.cs

@@ -1,10 +1,4 @@
-using System.Xml;
-using Mono.Cecil;
-using Mono.Cecil.Cil;
-using Mono.Cecil.Rocks;
-using Fody;
-
-public partial class ModuleWeaver : BaseModuleWeaver
+public partial class ModuleWeaver : BaseModuleWeaver
 {
     public override void Execute()
     {
@@ -181,7 +175,9 @@ void TryRedirectMethodInstruction(MethodReference method, Instruction instructio
             {
                 // Only redirect GetAwaiter; other members (including constructors) must not be redirected
                 if (method.Name != "GetAwaiter")
+                {
                     return;
+                }
 
                 var newOperand = genericConfiguredTaskAwaitableTypeDef.Method(method);
                 if (newOperand != null)
@@ -200,7 +196,9 @@ void TryRedirectMethodInstruction(MethodReference method, Instruction instructio
             {
                 // Only redirect GetAwaiter; other members (including constructors) must not be redirected
                 if (method.Name != "GetAwaiter")
+                {
                     return;
+                }
 
                 var newOperand = genericConfiguredValueTaskAwaitableTypeDef.Method(method);
                 if (newOperand != null)

ConfigureAwait.Fody/ModuleWeaver_CompilerServices.cs

@@ -1,9 +1,4 @@
-using Fody;
-using Mono.Cecil;
-using Mono.Cecil.Cil;
-using Mono.Cecil.Rocks;
-
-public partial class ModuleWeaver
+public partial class ModuleWeaver
 {
     /// <summary>
     /// Rewrites calls to <c>System.Runtime.CompilerServices.AsyncHelpers.Await(task)</c> inside
@@ -179,9 +174,10 @@ void AddAwaitConfigToAsyncMethod(MethodDefinition method, bool configureAwaitVal
 
     static MethodDefinition FindAwaitMethodDefinition(TypeDefinition declaringType, string configuredAwaitableName)
     {
-        return declaringType.Methods.FirstOrDefault(m =>
-            m.Name == "Await" &&
-            m.Parameters.Count == 1 &&
-            m.Parameters[0].ParameterType.Name == configuredAwaitableName) ?? throw new WeavingException($"Failed to find target method: Await({configuredAwaitableName})");
+        return declaringType.Methods
+            .FirstOrDefault(_ =>
+                _.Name == "Await" &&
+                _.Parameters.Count == 1 &&
+                _.Parameters[0].ParameterType.Name == configuredAwaitableName) ?? throw new WeavingException($"Failed to find target method: Await({configuredAwaitableName})");
     }
 }

ConfigureAwait.Fody/ModuleWeaver_Fields.cs

@@ -1,6 +1,4 @@
-using Mono.Cecil;
-
-public partial class ModuleWeaver
+public partial class ModuleWeaver
 {
     void ProcessFields(TypeDefinition type)
     {

ConfigureAwait.Fody/ModuleWeaver_TypeFinder.cs

@@ -1,6 +1,4 @@
-using Mono.Cecil;
-
-public partial class ModuleWeaver
+public partial class ModuleWeaver
 {
     TypeReference configuredTaskAwaitableTypeRef;
     TypeReference configuredValueTaskAwaitableTypeRef;

ConfigureAwait.Fody/ModuleWeaver_Variables.cs

@@ -1,7 +1,4 @@
-using Mono.Cecil;
-using Mono.Cecil.Cil;
-
-public partial class ModuleWeaver
+public partial class ModuleWeaver
 {
     void ProcessVariables(bool configureAwaitValue, MethodDefinition method)
     {