Code tidy up

Author: JLChnToZ

UInspectorPlus/ComponentMethodDrawer.cs

@@ -8,24 +8,24 @@
 using UnityObject = UnityEngine.Object;
 
 namespace UInspectorPlus {
-    class ComponentMethodDrawer: IReflectorDrawer {
-        object component;
-        readonly List<ComponentMethod> methods = new List<ComponentMethod>();
-        AnimBool showMethodOptions;
-        AnimBool showMethodSelector;
-        AnimBool showResultSelector;
-        string[] methodNames;
-        int selectedMethodIndex;
-        MemberInfo selectedMember;
-        ParameterInfo[] parameterInfo;
-        MethodPropertyDrawer[] parameters;
-        MethodPropertyDrawer result;
-        Exception thrownException;
-        string filter;
-        Type ctorType;
-        bool titleFolded = true, paramsFolded = true, resultFolded = true,
+    internal class ComponentMethodDrawer: IReflectorDrawer {
+        private object component;
+        private readonly List<ComponentMethod> methods = new List<ComponentMethod>();
+        private AnimBool showMethodOptions;
+        private AnimBool showMethodSelector;
+        private AnimBool showResultSelector;
+        private string[] methodNames;
+        private int selectedMethodIndex;
+        private MemberInfo selectedMember;
+        private ParameterInfo[] parameterInfo;
+        private MethodPropertyDrawer[] parameters;
+        private MethodPropertyDrawer result;
+        private Exception thrownException;
+        private string filter;
+        private readonly Type ctorType;
+        private bool titleFolded = true, paramsFolded = true, resultFolded = true,
             drawHeader = true, privateFields = true, obsolete = true;
-        MethodMode mode = 0;
+        private MethodMode mode = 0;
 
         public bool execButton = true;
 
@@ -123,7 +123,7 @@ public void Call() {
             }
             try {
                 thrownException = null;
-                var requestData = parameters.Select(d => d.Value).ToArray();
+                var requestData = Array.ConvertAll(parameters, d => d.Value);
                 object returnData;
                 switch (mode) {
                     case MethodMode.Constructor:
@@ -224,7 +224,7 @@ public bool UpdateValue() {
             return false;
         }
 
-        void AddComponentMethod(Type type) {
+        private void AddComponentMethod(Type type) {
             BindingFlags flag = BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public;
             if (privateFields)
                 flag |= BindingFlags.NonPublic;
@@ -250,7 +250,7 @@ void AddComponentMethod(Type type) {
             );
         }
 
-        void AddComponentMethod(object target) {
+        private void AddComponentMethod(object target) {
             BindingFlags flag = BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public;
             if (privateFields)
                 flag |= BindingFlags.NonPublic;
@@ -278,7 +278,7 @@ void AddComponentMethod(object target) {
             );
         }
 
-        void InitComponentMethods(bool resetIndex = true) {
+        private void InitComponentMethods(bool resetIndex = true) {
             methods.Clear();
             switch (mode) {
                 case MethodMode.Constructor:
@@ -316,7 +316,7 @@ void InitComponentMethods(bool resetIndex = true) {
             thrownException = null;
         }
 
-        string GetMethodNameFormatted(ComponentMethod m, int i) {
+        private string GetMethodNameFormatted(ComponentMethod m, int i) {
             string name, formatStr;
             ParameterInfo[] parameters;
             switch (m.mode) {
@@ -346,7 +346,7 @@ string GetMethodNameFormatted(ComponentMethod m, int i) {
             return string.Format(formatStr, name, Helper.JoinStringList(null, parameters.Select(x => x.ParameterType.Name), ", "));
         }
 
-        void InitMethodParams() {
+        private void InitMethodParams() {
             selectedMember = methods[selectedMethodIndex].member;
             switch (mode = methods[selectedMethodIndex].mode) {
                 case MethodMode.Constructor:
@@ -373,7 +373,7 @@ void InitMethodParams() {
             thrownException = null;
         }
 
-        void DrawComponent() {
+        private void DrawComponent() {
             if (OnClose != null)
                 EditorGUILayout.BeginHorizontal();
             selectedMethodIndex = EditorGUILayout.Popup(mode.ToString(), selectedMethodIndex, methodNames);
@@ -395,7 +395,7 @@ void DrawComponent() {
             EditorGUILayout.EndFadeGroup();
         }
 
-        void DrawMethod() {
+        private void DrawMethod() {
             switch (mode) {
                 case MethodMode.Constructor:
                     paramsFolded = EditorGUILayout.Foldout(paramsFolded, "Constructor");
@@ -425,7 +425,7 @@ void DrawMethod() {
             }
         }
 
-        void DrawResult() {
+        private void DrawResult() {
             if (mode == MethodMode.Indexer) {
                 if (result != null)
                     result.Draw(false);
@@ -450,7 +450,7 @@ void DrawResult() {
             }
         }
 
-        void DrawExecButton() {
+        private void DrawExecButton() {
             if (selectedMember == null) return;
             bool execute = false;
             switch (mode) {
@@ -470,7 +470,7 @@ void DrawExecButton() {
                 Call();
         }
 
-        void RequireRedraw() {
+        private void RequireRedraw() {
             if (OnRequireRedraw != null)
                 OnRequireRedraw();
         }

UInspectorPlus/Helpers.cs

@@ -9,7 +9,7 @@
 using UnityObject = UnityEngine.Object;
 
 namespace UInspectorPlus {
-    enum PropertyType {
+    internal enum PropertyType {
         Unknown,
         Bool,
         Enum,
@@ -35,25 +35,25 @@ enum PropertyType {
         RectInt,
     }
 
-    enum MethodMode {
+    internal enum MethodMode {
         Method,
         Constructor,
         Indexer
     }
 
-    struct ComponentMethod {
+    internal struct ComponentMethod {
         public MethodMode mode;
         public MemberInfo member;
         public object target;
     }
 
-    struct ComponentFields {
+    internal struct ComponentFields {
         public FieldInfo field;
         public PropertyInfo property;
         public UnityObject target;
     }
 
-    interface IReflectorDrawer {
+    internal interface IReflectorDrawer {
         void Draw();
         bool UpdateIfChanged();
         bool UpdateValue();
@@ -68,30 +68,18 @@ interface IReflectorDrawer {
     public static class Helper {
         internal static readonly Dictionary<Type, PropertyType> propertyTypeMapper = new Dictionary<Type, PropertyType>();
         internal static readonly Dictionary<Type, HashSet<string>> blackListedTypes = new Dictionary<Type, HashSet<string>>();
-        static double clickTime;
-        
+        private static double clickTime;
+
         // Delegate hacks to access the internal methods
-        internal static readonly Func<GUIContent, Rect, Gradient, Gradient> doGradientField = Delegate.CreateDelegate(
-            typeof(Func<GUIContent, Rect, Gradient, Gradient>),
-            typeof(EditorGUI).GetMethod(
-                "GradientField",
-                BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Static,
-                null, CallingConventions.Any,
-                new[] { typeof(GUIContent), typeof(Rect), typeof(Gradient) },
-                null
-            )
-        ) as Func<GUIContent, Rect, Gradient, Gradient>;
+        private delegate Gradient DoGradientField(GUIContent guiContent, Rect rect, Gradient gradient);
+        private static readonly DoGradientField doGradientField =
+            GetDelegate<DoGradientField>(typeof(EditorGUI), "GradientField");
 
-        internal static readonly Func<GUIContent, Gradient, GUILayoutOption[], Gradient> doLayoutGradiantField = Delegate.CreateDelegate(
-            typeof(Func<GUIContent, Gradient, GUILayoutOption[], Gradient>),
-            typeof(EditorGUILayout).GetMethod(
-                "GradientField",
-                BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Static,
-                null, CallingConventions.Any,
-                new[] { typeof(GUIContent), typeof(Gradient), typeof(GUILayoutOption[]) },
-                null
-            )
-        ) as Func<GUIContent, Gradient, GUILayoutOption[], Gradient>;
+        private delegate Gradient DoLayoutGradientField(GUIContent guiContent, Gradient gradient, params GUILayoutOption[] options);
+        private static readonly DoLayoutGradientField doLayoutGradiantField =
+            GetDelegate<DoLayoutGradientField>(typeof(EditorGUILayout), "GradientField");
+
+        private static readonly Hashtable storedState = new Hashtable();
 
         internal static void InitPropertyTypeMapper() {
             if (propertyTypeMapper.Count > 0)
@@ -124,20 +112,20 @@ internal static void InitPropertyTypeMapper() {
             AddPropertyTypeMap("UnityEngine.Vector3Int, UnityEngine.dll", PropertyType.Vector3Int);
             AddPropertyTypeMap("UnityEngine.RectInt, UnityEngine.dll", PropertyType.RectInt);
 
-            // Danger properties! Do not use them or they will instanlize junks
+            // Danger properties! Do not use them or they will instanate junks
             AddBlacklistedType("UnityEngine.MeshFilter, UnityEngine.dll", "mesh");
             AddBlacklistedType("UnityEngine.Renderer, UnityEngine.dll", "material", "materials");
             AddBlacklistedType("UnityEngine.Collider, UnityEngine.dll", "material");
             AddBlacklistedType("UnityEngine.Collider2D, UnityEngine.dll", "material");
         }
 
-        static void AddPropertyTypeMap(string typeName, PropertyType propType) {
+        private static void AddPropertyTypeMap(string typeName, PropertyType propType) {
             Type type = Type.GetType(typeName, false, false);
             if (type != null)
                 propertyTypeMapper.Add(type, propType);
         }
 
-        static void AddBlacklistedType(string typeName, params string[] props) {
+        private static void AddBlacklistedType(string typeName, params string[] props) {
             Type type = Type.GetType(typeName, false, false);
             if (type == null) return;
             HashSet<string> list;
@@ -146,8 +134,6 @@ static void AddBlacklistedType(string typeName, params string[] props) {
             list.UnionWith(props);
         }
 
-        static readonly Hashtable storedState = new Hashtable();
-
         internal static void StoreState(object key, object value) {
             if (storedState.ContainsKey(key))
                 storedState[key] = value;
@@ -279,8 +265,8 @@ internal static object EnumField(GUIContent label, Type type, object value, para
             return EnumFieldPostProcess(itemValues, newVal);
         }
 
-        static int EnumFieldPreProcess(Type type, object rawValue, out GUIContent[] itemNames, out Array itemValues) {
-            itemNames = Enum.GetNames(type).Select(x => new GUIContent(x)).ToArray();
+        private static int EnumFieldPreProcess(Type type, object rawValue, out GUIContent[] itemNames, out Array itemValues) {
+            itemNames = Array.ConvertAll(Enum.GetNames(type), x => new GUIContent(x));
             itemValues = Enum.GetValues(type);
             long val = Convert.ToInt64(rawValue);
             for (int i = 0; i < itemValues.Length; i++)
@@ -289,7 +275,7 @@ static int EnumFieldPreProcess(Type type, object rawValue, out GUIContent[] item
             return 0;
         }
 
-        static object EnumFieldPostProcess(Array itemValues, int val) {
+        private static object EnumFieldPostProcess(Array itemValues, int val) {
             return itemValues.GetValue(val);
         }
 
@@ -318,7 +304,7 @@ internal static object MaskedEnumField(GUIContent label, Type type, object mask,
             return MaskedEnumFieldPostProcess(type, itemValues, mask, val, newVal);
         }
 
-        static int MaskedEnumFieldPreProcess(Type type, object rawValue, out string[] itemNames, out Array itemValues) {
+        private static int MaskedEnumFieldPreProcess(Type type, object rawValue, out string[] itemNames, out Array itemValues) {
             itemNames = Enum.GetNames(type);
             itemValues = Enum.GetValues(type);
             int maskVal = 0;
@@ -334,7 +320,7 @@ static int MaskedEnumFieldPreProcess(Type type, object rawValue, out string[] it
             return maskVal;
         }
 
-        static object MaskedEnumFieldPostProcess(Type enumType, Array itemValues, object rawValue, int maskVal, int newMaskVal) {
+        private static object MaskedEnumFieldPostProcess(Type enumType, Array itemValues, object rawValue, int maskVal, int newMaskVal) {
             int changes = maskVal ^ newMaskVal;
             long value = Convert.ToInt64(rawValue), itemValue;
             for (int i = 0; i < itemValues.Length; i++)
@@ -429,22 +415,22 @@ internal static UnityObject ObjectField(Rect position, GUIContent label, UnityOb
         }
 
         internal static Gradient GradientField(Rect position, GUIContent label, Gradient value) {
-            return doGradientField.Invoke(label, position, value);
+            return doGradientField(label, position, value);
         }
 
         internal static Gradient GradientField(GUIContent label, Gradient value, params GUILayoutOption[] options) {
-            return doLayoutGradiantField.Invoke(label, value, options);
+            return doLayoutGradiantField(label, value, options);
         }
 
-        static void ClickObject(UnityObject obj) {
+        private static void ClickObject(UnityObject obj) {
             var newClickTime = EditorApplication.timeSinceStartup;
             if (newClickTime - clickTime < 0.3 && obj != null)
                 Selection.activeObject = obj;
             clickTime = newClickTime;
             EditorGUIUtility.PingObject(obj);
         }
 
-        static int CountLines(string str) {
+        private static int CountLines(string str) {
             if (string.IsNullOrEmpty(str))
                 return 1;
             int cursor = 0, count = 0, length = str.Length, i = -1;
@@ -551,7 +537,27 @@ internal static GUIStyle GetGUIStyle(string styleName) {
             return value == null ? defaultValue : (T)value;
         }
 
-        [MenuItem("Window/Script Tester/Inspector+")]
+        internal static T GetDelegate<T>(Type fromType, string methodName) where T : class {
+            Type t = typeof(T);
+            if (!t.IsSubclassOf(typeof(Delegate)))
+                throw new ArgumentException(string.Format("{0} is not delegate.", t.Name));
+            MethodInfo invokeMethod = t.GetMethod("Invoke");
+            if (invokeMethod == null)
+                throw new ArgumentException(string.Format(
+                    "Cannot determine what parameters does {0} have, as no Invoke(...) signature found. Perhaps this is not a valid delegate.",
+                    t.Name
+                ));
+            MethodInfo method = fromType.GetMethod(
+                methodName,
+                BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Static,
+                null, CallingConventions.Any,
+                Array.ConvertAll(invokeMethod.GetParameters(), p => p.ParameterType),
+                null
+            );
+            return method == null ? null : Delegate.CreateDelegate(t, method) as T;
+        }
+
+        [MenuItem("Window/Inspector+")]
         public static void ShowInspectorPlus() {
             EditorWindow.GetWindow(typeof(InspectorPlus));
         }

UInspectorPlus/HexEdit.cs

@@ -8,10 +8,10 @@
 
 namespace UInspectorPlus {
     internal class HexEdit {
-        [SerializeField] Vector2 scrollPos;
+        [SerializeField] private Vector2 scrollPos;
         public byte[] data;
         public int columns = 16;
-        GUIContent temp = new GUIContent();
+        private GUIContent temp = new GUIContent();
 
         public float Height {
             get {