cleanup

Fody · May 8, 2024 · ffd34f2 · ffd34f2
1 parent 73da0d1
commit ffd34f2
Show file tree

Hide file tree

Showing 17 changed files with 26 additions and 53 deletions.
diff --git a/InfoOf.Fody/GlobalUsings.cs b/InfoOf.Fody/GlobalUsings.cs
@@ -1,2 +1,5 @@
-global using Mono.Cecil;
-global using Mono.Cecil.Cil;
+global using Fody;
+global using Mono.Cecil;
+global using Mono.Cecil.Cil;
+global using Mono.Cecil.Rocks;
+global using Mono.Collections.Generic;
diff --git a/InfoOf.Fody/ILProcessor.cs b/InfoOf.Fody/ILProcessor.cs
@@ -1,7 +1,4 @@
-using Mono.Cecil.Rocks;
-using Mono.Collections.Generic;
-
-#nullable enable
+#nullable enable
 
 public sealed class ILProcessor : IDisposable
 {

diff --git a/InfoOf.Fody/MethodProcessor.cs b/InfoOf.Fody/MethodProcessor.cs
@@ -1,6 +1,3 @@
-using Fody;
-using Mono.Cecil.Rocks;
-
 public partial class ModuleWeaver
 {
     void ProcessMethod(MethodDefinition method)

diff --git a/InfoOf.Fody/ModuleWeaver.cs b/InfoOf.Fody/ModuleWeaver.cs
@@ -1,6 +1,4 @@
-using Fody;
-
-public partial class ModuleWeaver:BaseModuleWeaver
+public partial class ModuleWeaver:BaseModuleWeaver
 {
     List<TypeDefinition> allTypes;
 

diff --git a/InfoOf.Fody/OfConstructor.cs b/InfoOf.Fody/OfConstructor.cs
@@ -1,10 +1,8 @@
 public partial class ModuleWeaver
 {
-    void HandleOfConstructor(Instruction instruction, ILProcessor ilProcessor,
-        MethodReference ofConstructorReference)
+    //Info.OfConstructor("AssemblyToProcess","MethodClass");
+    void HandleOfConstructor(Instruction instruction, ILProcessor ilProcessor, MethodReference ofConstructorReference)
     {
-        //Info.OfConstructor("AssemblyToProcess","MethodClass");
-
         Instruction typeNameInstruction;
         List<string> parameters;
         Instruction parametersInstruction = null;

diff --git a/InfoOf.Fody/OfFieldHandler.cs b/InfoOf.Fody/OfFieldHandler.cs
@@ -1,10 +1,8 @@
-using Fody;
-
 public partial class ModuleWeaver
 {
+    //Info.OfField("AssemblyToProcess","MethodClass","Field");
     void HandleOfField(Instruction instruction, ILProcessor ilProcessor, MethodReference ofFieldReference)
     {
-        //Info.OfField("AssemblyToProcess","MethodClass","Field");
         var fieldNameInstruction = instruction.Previous;
         var fieldName = GetLdString(fieldNameInstruction);
 

diff --git a/InfoOf.Fody/OfIndexerHandler.cs b/InfoOf.Fody/OfIndexerHandler.cs
@@ -1,19 +1,17 @@
-using Fody;
-
-public partial class ModuleWeaver
+public partial class ModuleWeaver
 {
-    void HandleOfIndexerGet(Instruction instruction, ILProcessor ilProcessor, MethodReference ofIndexerGetReference)
-    {
+    void HandleOfIndexerGet(Instruction instruction, ILProcessor ilProcessor, MethodReference ofIndexerGetReference) =>
         HandleOfIndexer(instruction, ilProcessor, ofIndexerGetReference, _ => _.GetMethod, (_, p) => p);
-    }
 
-    void HandleOfIndexerSet(Instruction instruction, ILProcessor ilProcessor, MethodReference ofIndexerSetReference)
-    {
+    void HandleOfIndexerSet(Instruction instruction, ILProcessor ilProcessor, MethodReference ofIndexerSetReference) =>
         HandleOfIndexer(instruction, ilProcessor, ofIndexerSetReference, _ => _.SetMethod, (d, p) => p.Append(d.PropertyType.Name).ToList());
-    }
 
-    void HandleOfIndexer(Instruction instruction, ILProcessor ilProcessor, MethodReference propertyReference,
-        Func<PropertyDefinition, MethodDefinition> func, Func<PropertyDefinition, List<string>, List<string>> getParameters)
+    void HandleOfIndexer(
+        Instruction instruction,
+        ILProcessor ilProcessor,
+        MethodReference propertyReference,
+        Func<PropertyDefinition, MethodDefinition> func,
+        Func<PropertyDefinition, List<string>, List<string>> getParameters)
     {
         var parametersInstruction = instruction.Previous;
         var parameters = GetLdString(parametersInstruction).GetParameters();

diff --git a/InfoOf.Fody/OfMethodHandler.cs b/InfoOf.Fody/OfMethodHandler.cs
@@ -1,9 +1,8 @@
 public partial class ModuleWeaver
 {
+    //Info.OfMethod("AssemblyToProcess","MethodClass","InstanceMethod");
     void HandleOfMethod(Instruction instruction, ILProcessor ilProcessor, MethodReference ofMethodReference)
     {
-        //Info.OfMethod("AssemblyToProcess","MethodClass","InstanceMethod");
-
         Instruction methodNameInstruction;
         List<string> parameters;
         Instruction parametersInstruction = null;

diff --git a/InfoOf.Fody/OfPropertyHandler.cs b/InfoOf.Fody/OfPropertyHandler.cs
@@ -1,16 +1,10 @@
-using Fody;
-
 public partial class ModuleWeaver
 {
-    void HandleOfPropertyGet(Instruction instruction, ILProcessor ilProcessor, MethodReference ofPropertyGetReference)
-    {
+    void HandleOfPropertyGet(Instruction instruction, ILProcessor ilProcessor, MethodReference ofPropertyGetReference) =>
         HandleOfProperty(instruction, ilProcessor, ofPropertyGetReference, _ => _.GetMethod);
-    }
 
-    void HandleOfPropertySet(Instruction instruction, ILProcessor ilProcessor, MethodReference ofPropertySetReference)
-    {
+    void HandleOfPropertySet(Instruction instruction, ILProcessor ilProcessor, MethodReference ofPropertySetReference) =>
         HandleOfProperty(instruction, ilProcessor, ofPropertySetReference, _ => _.SetMethod);
-    }
 
     void HandleOfProperty(Instruction instruction, ILProcessor ilProcessor, MethodReference propertyReference, Func<PropertyDefinition, MethodDefinition> func)
     {

diff --git a/InfoOf.Fody/OfTypeHandler.cs b/InfoOf.Fody/OfTypeHandler.cs
@@ -1,9 +1,8 @@
 public partial class ModuleWeaver
 {
+    //Info.OfType("AssemblyToProcess","TypeClass");
     void HandleOfType(Instruction instruction, ILProcessor ilProcessor)
     {
-        //Info.OfType("AssemblyToProcess","TypeClass");
-
         var typeNameInstruction = instruction.Previous;
         var typeName = GetLdString(typeNameInstruction);
 

diff --git a/InfoOf.Fody/ParamChecker.cs b/InfoOf.Fody/ParamChecker.cs
@@ -1,5 +1,3 @@
-using Fody;
-
 public static class ParamChecker
 {
     public static MethodDefinition FindMethodDefinitions(this TypeDefinition typeDefinition, string methodName, List<string> parameters)

diff --git a/InfoOf.Fody/TypeNameParsing/AssemblyNameState.cs b/InfoOf.Fody/TypeNameParsing/AssemblyNameState.cs
@@ -1,5 +1,3 @@
-using Fody;
-
 class AssemblyNameState(GenericParameterState parentState) : IState
 {
     IState childState;

diff --git a/InfoOf.Fody/TypeNameParsing/GenericParameterState.cs b/InfoOf.Fody/TypeNameParsing/GenericParameterState.cs
@@ -1,5 +1,3 @@
-using Fody;
-
 class GenericParameterState(TypeNameState parentState) : IState
 {
     IList<AssemblyNameState> genericParameters = new List<AssemblyNameState>();

diff --git a/InfoOf.Fody/TypeNameParsing/TokenReadState.cs b/InfoOf.Fody/TypeNameParsing/TokenReadState.cs
@@ -1,5 +1,3 @@
-using Fody;
-
 class TokenReadState(IState parentState) : IState
 {
     public IState OnGenericTypeStart() =>

diff --git a/InfoOf.Fody/TypeNameParsing/TypeNameParser.cs b/InfoOf.Fody/TypeNameParsing/TypeNameParser.cs
@@ -1,5 +1,4 @@
 using System.Text;
-using Fody;
 
 public static class TypeNameParser
 {

diff --git a/InfoOf.Fody/TypeNameParsing/TypeNameState.cs b/InfoOf.Fody/TypeNameParsing/TypeNameState.cs
@@ -1,5 +1,3 @@
-using Fody;
-
 class TypeNameState : IState
 {
     AssemblyNameState parentState;

diff --git a/InfoOf.Fody/TypeReferenceExtensions.cs b/InfoOf.Fody/TypeReferenceExtensions.cs
@@ -7,10 +7,12 @@ public static bool IsNamed(this TypeReference type, string typeName)
         {
             return true;
         }
+
         if (typeName == type.Name)
         {
             return true;
         }
+
         var dotIndex = fullName.IndexOf('.');
         if (dotIndex > 0)
         {
@@ -21,6 +23,7 @@ public static bool IsNamed(this TypeReference type, string typeName)
                 return true;
             }
         }
+
         return false;
     }
 }