Cleanups, method summaries, bump version

sinai-dev · sinai-dev · commit 9efb9581f563 · 2021-03-12T18:41:57.000+11:00
diff --git a/src/ExplorerCore.cs b/src/ExplorerCore.cs
@@ -15,7 +15,7 @@ namespace UnityExplorer
     public class ExplorerCore
     {
         public const string NAME = "UnityExplorer";
-        public const string VERSION = "3.2.1";
+        public const string VERSION = "3.2.2";
         public const string AUTHOR = "Sinai";
         public const string GUID = "com.sinai.unityexplorer";
 
diff --git a/src/Helpers/ICallHelper.cs b/src/Helpers/ICallHelper.cs
@@ -11,20 +11,27 @@ public static class ICallHelper
     {
         private static readonly Dictionary<string, Delegate> iCallCache = new Dictionary<string, Delegate>();
 
-        public static T GetICall<T>(string iCallName) where T : Delegate
+        /// <summary>
+        /// Helper to get and cache an iCall by providing the signature (eg. "UnityEngine.Resources::FindObjectsOfTypeAll").
+        /// </summary>
+        /// <typeparam name="T">The Type of Delegate to provide for the iCall.</typeparam>
+        /// <param name="signature">The signature of the iCall you want to get.</param>
+        /// <returns>The <typeparamref name="T"/> delegate if successful.</returns>
+        /// <exception cref="MissingMethodException">If the iCall could not be found.</exception>
+        public static T GetICall<T>(string signature) where T : Delegate
         {
-            if (iCallCache.ContainsKey(iCallName))
-                return (T)iCallCache[iCallName];
+            if (iCallCache.ContainsKey(signature))
+                return (T)iCallCache[signature];
 
-            IntPtr ptr = il2cpp_resolve_icall(iCallName);
+            IntPtr ptr = il2cpp_resolve_icall(signature);
 
             if (ptr == IntPtr.Zero)
             {
-                throw new MissingMethodException($"Could not resolve internal call by name '{iCallName}'!");
+                throw new MissingMethodException($"Could not resolve internal call by name '{signature}'!");
             }
 
             Delegate iCall = Marshal.GetDelegateForFunctionPointer(ptr, typeof(T));
-            iCallCache.Add(iCallName, iCall);
+            iCallCache.Add(signature, iCall);
 
             return (T)iCall;
         }
diff --git a/src/Inspectors/Reflection/CacheObject/CacheMember.cs b/src/Inspectors/Reflection/CacheObject/CacheMember.cs
@@ -381,7 +381,7 @@ internal void AddArgRow(int i, GameObject parent)
             argLabelLayout.minHeight = 25;
             var argText = argLabelObj.GetComponent<Text>();
             var argTypeTxt = UISyntaxHighlight.ParseFullSyntax(arg.ParameterType, false);
-            argText.text = $"{argTypeTxt} <color={UISyntaxHighlight.Local}>{arg.Name}</color>";
+            argText.text = $"{argTypeTxt} <color={UISyntaxHighlight.LOCAL_ARG}>{arg.Name}</color>";
 
             var argInputObj = UIFactory.CreateInputField(rowObj, 14, (int)TextAnchor.MiddleLeft, 1);
             var argInputLayout = argInputObj.AddComponent<LayoutElement>();
diff --git a/src/Inspectors/Reflection/CacheObject/CacheMethod.cs b/src/Inspectors/Reflection/CacheObject/CacheMethod.cs
@@ -168,7 +168,7 @@ internal void AddGenericArgRow(int i, GameObject parent)
             //var argLayout = argLabelObj.AddComponent<LayoutElement>();
             //argLayout.minWidth = 20;
             var argText = argLabelObj.GetComponent<Text>();
-            argText.text = $"{constrainTxt} <color={UISyntaxHighlight.Enum}>{arg.Name}</color>";
+            argText.text = $"{constrainTxt} <color={UISyntaxHighlight.CONST_VAR}>{arg.Name}</color>";
 
             var argInputObj = UIFactory.CreateInputField(rowObj, 14, (int)TextAnchor.MiddleLeft, 1);
             var argInputLayout = argInputObj.AddComponent<LayoutElement>();
diff --git a/src/UI/UISyntaxHighlight.cs b/src/UI/UISyntaxHighlight.cs
@@ -8,36 +8,36 @@ namespace UnityExplorer.UI
 {
     public class UISyntaxHighlight
     {
-        public const string Field_Static = "#8d8dc6";
-        public const string Field_Instance = "#c266ff";
+        public const string FIELD_STATIC = "#8d8dc6";
+        public const string FIELD_INSTANCE = "#c266ff";
 
-        public const string Method_Static = "#b55b02";
-        public const string Method_Instance = "#ff8000";
+        public const string METHOD_STATIC = "#b55b02";
+        public const string METHOD_INSTANCE = "#ff8000";
 
-        public const string Prop_Static = "#588075";
-        public const string Prop_Instance = "#55a38e";
+        public const string PROP_STATIC = "#588075";
+        public const string PROP_INSTANCE = "#55a38e";
 
-        public const string Class_Static = "#3a8d71";
-        public const string Class_Instance = "#2df7b2";
+        public const string CLASS_STATIC = "#3a8d71";
+        public const string CLASS_INSTANCE = "#2df7b2";
 
-        public const string Local = "#a6e9e9";
+        public const string CLASS_STRUCT = "#0fba3a";
 
-        public const string StructGreen = "#0fba3a";
+        public const string LOCAL_ARG = "#a6e9e9";
 
-        public static string Enum = "#92c470";
+        public static string CONST_VAR = "#92c470";
 
         internal static readonly Color s_silver = new Color(0.66f, 0.66f, 0.66f);
 
         internal static string GetClassColor(Type type)
         {
             if (type.IsAbstract && type.IsSealed)
-                return Class_Static;
+                return CLASS_STATIC;
             else if (type.IsEnum || type.IsGenericParameter)
-                return Enum;
+                return CONST_VAR;
             else if (type.IsValueType)
-                return StructGreen;
+                return CLASS_STRUCT;
             else
-                return Class_Instance;
+                return CLASS_INSTANCE;
         }
 
         public static string ParseFullSyntax(Type type, bool includeNamespace, MemberInfo memberInfo = null)
@@ -49,7 +49,7 @@ public static string ParseFullSyntax(Type type, bool includeNamespace, MemberInf
 
             if (type.IsGenericParameter || (type.HasElementType && type.GetElementType().IsGenericParameter))
             {
-                ret = $"<color={Enum}>{type.Name}</color>";
+                ret = $"<color={CONST_VAR}>{type.Name}</color>";
             }
             else
             {
@@ -134,7 +134,7 @@ private static string ParseGenericArgs(Type[] gArgs, bool allGeneric = false)
 
                 if (allGeneric)
                 {
-                    args += $"<color={Enum}>{arg.Name}</color>";
+                    args += $"<color={CONST_VAR}>{arg.Name}</color>";
                     continue;
                 }
 
@@ -153,30 +153,30 @@ private static string GetMemberInfoColor(MemberInfo memberInfo, out bool isStati
                 if (fi.IsStatic)
                 {
                     isStatic = true;
-                    memberColor = Field_Static;
+                    memberColor = FIELD_STATIC;
                 }
                 else
-                    memberColor = Field_Instance;
+                    memberColor = FIELD_INSTANCE;
             }
             else if (memberInfo is MethodInfo mi)
             {
                 if (mi.IsStatic)
                 {
                     isStatic = true;
-                    memberColor = Method_Static;
+                    memberColor = METHOD_STATIC;
                 }
                 else
-                    memberColor = Method_Instance;
+                    memberColor = METHOD_INSTANCE;
             }
             else if (memberInfo is PropertyInfo pi)
             {
                 if (pi.GetAccessors(true)[0].IsStatic)
                 {
                     isStatic = true;
-                    memberColor = Prop_Static;
+                    memberColor = PROP_STATIC;
                 }
                 else
-                    memberColor = Prop_Instance;
+                    memberColor = PROP_INSTANCE;
             }
             return memberColor;
         }

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ namespace UnityExplorer`
`15`	`15`	`public class ExplorerCore`
`16`	`16`	`{`
`17`	`17`	`public const string NAME = "UnityExplorer";`
`18`		`- public const string VERSION = "3.2.1";`
	`18`	`+ public const string VERSION = "3.2.2";`
`19`	`19`	`public const string AUTHOR = "Sinai";`
`20`	`20`	`public const string GUID = "com.sinai.unityexplorer";`
`21`	`21`
Original file line number	Diff line number	Diff line change
`@@ -11,20 +11,27 @@ public static class ICallHelper`
`11`	`11`	`{`
`12`	`12`	`private static readonly Dictionary<string, Delegate> iCallCache = new Dictionary<string, Delegate>();`
`13`	`13`
`14`		`- public static T GetICall<T>(string iCallName) where T : Delegate`
	`14`	`+ /// <summary>`
	`15`	`+ /// Helper to get and cache an iCall by providing the signature (eg. "UnityEngine.Resources::FindObjectsOfTypeAll").`
	`16`	`+ /// </summary>`
	`17`	`+ /// <typeparam name="T">The Type of Delegate to provide for the iCall.</typeparam>`
	`18`	`+ /// <param name="signature">The signature of the iCall you want to get.</param>`
	`19`	`+ /// <returns>The <typeparamref name="T"/> delegate if successful.</returns>`
	`20`	`+ /// <exception cref="MissingMethodException">If the iCall could not be found.</exception>`
	`21`	`+ public static T GetICall<T>(string signature) where T : Delegate`
`15`	`22`	`{`
`16`		`- if (iCallCache.ContainsKey(iCallName))`
`17`		`- return (T)iCallCache[iCallName];`
	`23`	`+ if (iCallCache.ContainsKey(signature))`
	`24`	`+ return (T)iCallCache[signature];`
`18`	`25`
`19`		`- IntPtr ptr = il2cpp_resolve_icall(iCallName);`
	`26`	`+ IntPtr ptr = il2cpp_resolve_icall(signature);`
`20`	`27`
`21`	`28`	`if (ptr == IntPtr.Zero)`
`22`	`29`	`{`
`23`		`- throw new MissingMethodException($"Could not resolve internal call by name '{iCallName}'!");`
	`30`	`+ throw new MissingMethodException($"Could not resolve internal call by name '{signature}'!");`
`24`	`31`	`}`
`25`	`32`
`26`	`33`	`Delegate iCall = Marshal.GetDelegateForFunctionPointer(ptr, typeof(T));`
`27`		`- iCallCache.Add(iCallName, iCall);`
	`34`	`+ iCallCache.Add(signature, iCall);`
`28`	`35`
`29`	`36`	`return (T)iCall;`
`30`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,36 +8,36 @@ namespace UnityExplorer.UI`
`8`	`8`	`{`
`9`	`9`	`public class UISyntaxHighlight`
`10`	`10`	`{`
`11`		`- public const string Field_Static = "#8d8dc6";`
`12`		`- public const string Field_Instance = "#c266ff";`
	`11`	`+ public const string FIELD_STATIC = "#8d8dc6";`
	`12`	`+ public const string FIELD_INSTANCE = "#c266ff";`
`13`	`13`
`14`		`- public const string Method_Static = "#b55b02";`
`15`		`- public const string Method_Instance = "#ff8000";`
	`14`	`+ public const string METHOD_STATIC = "#b55b02";`
	`15`	`+ public const string METHOD_INSTANCE = "#ff8000";`
`16`	`16`
`17`		`- public const string Prop_Static = "#588075";`
`18`		`- public const string Prop_Instance = "#55a38e";`
	`17`	`+ public const string PROP_STATIC = "#588075";`
	`18`	`+ public const string PROP_INSTANCE = "#55a38e";`
`19`	`19`
`20`		`- public const string Class_Static = "#3a8d71";`
`21`		`- public const string Class_Instance = "#2df7b2";`
	`20`	`+ public const string CLASS_STATIC = "#3a8d71";`
	`21`	`+ public const string CLASS_INSTANCE = "#2df7b2";`
`22`	`22`
`23`		`- public const string Local = "#a6e9e9";`
	`23`	`+ public const string CLASS_STRUCT = "#0fba3a";`
`24`	`24`
`25`		`- public const string StructGreen = "#0fba3a";`
	`25`	`+ public const string LOCAL_ARG = "#a6e9e9";`
`26`	`26`
`27`		`- public static string Enum = "#92c470";`
	`27`	`+ public static string CONST_VAR = "#92c470";`
`28`	`28`
`29`	`29`	`internal static readonly Color s_silver = new Color(0.66f, 0.66f, 0.66f);`
`30`	`30`
`31`	`31`	`internal static string GetClassColor(Type type)`
`32`	`32`	`{`
`33`	`33`	`if (type.IsAbstract && type.IsSealed)`
`34`		`- return Class_Static;`
	`34`	`+ return CLASS_STATIC;`
`35`	`35`	`else if (type.IsEnum \|\| type.IsGenericParameter)`
`36`		`- return Enum;`
	`36`	`+ return CONST_VAR;`
`37`	`37`	`else if (type.IsValueType)`
`38`		`- return StructGreen;`
	`38`	`+ return CLASS_STRUCT;`
`39`	`39`	`else`
`40`		`- return Class_Instance;`
	`40`	`+ return CLASS_INSTANCE;`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`public static string ParseFullSyntax(Type type, bool includeNamespace, MemberInfo memberInfo = null)`
`@@ -49,7 +49,7 @@ public static string ParseFullSyntax(Type type, bool includeNamespace, MemberInf`
`49`	`49`
`50`	`50`	`if (type.IsGenericParameter \|\| (type.HasElementType && type.GetElementType().IsGenericParameter))`
`51`	`51`	`{`
`52`		`- ret = $"<color={Enum}>{type.Name}</color>";`
	`52`	`+ ret = $"<color={CONST_VAR}>{type.Name}</color>";`
`53`	`53`	`}`
`54`	`54`	`else`
`55`	`55`	`{`
`@@ -134,7 +134,7 @@ private static string ParseGenericArgs(Type[] gArgs, bool allGeneric = false)`
`134`	`134`
`135`	`135`	`if (allGeneric)`
`136`	`136`	`{`
`137`		`- args += $"<color={Enum}>{arg.Name}</color>";`
	`137`	`+ args += $"<color={CONST_VAR}>{arg.Name}</color>";`
`138`	`138`	`continue;`
`139`	`139`	`}`
`140`	`140`
`@@ -153,30 +153,30 @@ private static string GetMemberInfoColor(MemberInfo memberInfo, out bool isStati`
`153`	`153`	`if (fi.IsStatic)`
`154`	`154`	`{`
`155`	`155`	`isStatic = true;`
`156`		`- memberColor = Field_Static;`
	`156`	`+ memberColor = FIELD_STATIC;`
`157`	`157`	`}`
`158`	`158`	`else`
`159`		`- memberColor = Field_Instance;`
	`159`	`+ memberColor = FIELD_INSTANCE;`
`160`	`160`	`}`
`161`	`161`	`else if (memberInfo is MethodInfo mi)`
`162`	`162`	`{`
`163`	`163`	`if (mi.IsStatic)`
`164`	`164`	`{`
`165`	`165`	`isStatic = true;`
`166`		`- memberColor = Method_Static;`
	`166`	`+ memberColor = METHOD_STATIC;`
`167`	`167`	`}`
`168`	`168`	`else`
`169`		`- memberColor = Method_Instance;`
	`169`	`+ memberColor = METHOD_INSTANCE;`
`170`	`170`	`}`
`171`	`171`	`else if (memberInfo is PropertyInfo pi)`
`172`	`172`	`{`
`173`	`173`	`if (pi.GetAccessors(true)[0].IsStatic)`
`174`	`174`	`{`
`175`	`175`	`isStatic = true;`
`176`		`- memberColor = Prop_Static;`
	`176`	`+ memberColor = PROP_STATIC;`
`177`	`177`	`}`
`178`	`178`	`else`
`179`		`- memberColor = Prop_Instance;`
	`179`	`+ memberColor = PROP_INSTANCE;`
`180`	`180`	`}`
`181`	`181`	`return memberColor;`
`182`	`182`	`}`