Merge branch 'master' of github.com:JLChnToZ/UnityScriptTester

Author: JLChnToZ

UInspectorPlus/.editorconfig

@@ -0,0 +1,28 @@
+[*]
+end_of_line = crlf
+
+[*.xml]
+indent_style = space
+
+# My C# coding style (Modified K&R)
+[*.cs]
+csharp_new_line_before_open_brace = none
+csharp_new_line_before_else = false
+csharp_new_line_before_catch = false
+csharp_new_line_before_finally = false
+csharp_new_line_before_members_in_object_initializers = true
+csharp_new_line_before_members_in_anonymous_types = true
+csharp_new_line_between_query_expression_clauses = true
+csharp_indent_case_contents = true
+csharp_indent_switch_labels = true
+csharp_indent_labels= no_change
+csharp_space_after_cast = false
+csharp_space_after_keywords_in_control_flow_statements = false
+csharp_space_between_method_declaration_parameter_list_parentheses = false
+csharp_space_between_method_call_parameter_list_parentheses = false
+csharp_space_before_colon_in_inheritance_clause = false
+csharp_space_after_colon_in_inheritance_clause = true
+csharp_space_around_binary_operators = before_and_after
+csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
+csharp_space_between_method_call_name_and_opening_parenthesis = false
+csharp_space_between_method_call_empty_parameter_list_parentheses = false

UInspectorPlus/ComponentMethodDrawer.cs

@@ -96,6 +96,7 @@ public ComponentMethodDrawer(Type type)
         public string Filter {
             get { return filter; }
             set {
+                if(filter == value) return;
                 filter = value;
                 InitComponentMethods(false);
             }

UInspectorPlus/Helpers.cs

@@ -15,7 +15,7 @@ internal class HexEdit: InspectorDrawer {
 
         public float Height {
             get {
-                if (Data == null) return 0;
+                if(Data == null) return 0;
                 return (Data.Length + columns) / columns * (EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing);
             }
         }
@@ -25,7 +25,7 @@ public HexEdit(object target, Type targetType, bool shown, bool showProps, bool
         }
 
         protected override void Draw(bool readOnly) {
-            if (Data != null)
+            if(Data != null)
                 Draw(EditorGUILayout.GetControlRect(
                     false, Height, GUILayout.MinHeight(EditorGUIUtility.singleLineHeight * 3), GUILayout.ExpandHeight(true)
                 ));
@@ -36,18 +36,18 @@ protected override void Draw(bool readOnly) {
         private void Draw(Rect viewport) {
             float height = EditorGUIUtility.singleLineHeight;
             float padHeight = height + EditorGUIUtility.standardVerticalSpacing;
-            if (Data != null) {
+            if(Data != null) {
                 temp.text = Data.Length.ToString("X8");
                 Vector2 labelSize = GUI.skin.label.CalcSize(temp);
                 Rect contentRect = new Rect(0, 0, labelSize.x + (columns * 1.7F + 2) * height, Height);
                 GUI.Box(viewport, GUIContent.none, GUI.skin.textArea);
                 scrollPos = GUI.BeginScrollView(viewport, scrollPos, contentRect);
                 bool changed = GUI.changed;
                 GUI.changed = false;
-                for (int start = Mathf.FloorToInt(scrollPos.y / padHeight) * columns,
+                for(int start = Mathf.FloorToInt(scrollPos.y / padHeight) * columns,
                     end = Math.Min(Data.Length, start + Mathf.CeilToInt(viewport.height / padHeight) * columns),
                     col = start; col < end; col++) {
-                    if (col % columns == 0) {
+                    if(col % columns == 0) {
                         temp.text = col.ToString("X8");
                         GUI.Label(new Rect(0, col / columns * padHeight, labelSize.x, labelSize.y), temp);
                     }
@@ -60,11 +60,11 @@ private void Draw(Rect viewport) {
                         Data[col].ToString("X2"),
                         2, GUI.skin.label
                     );
-                    if (GUI.changed) {
+                    if(GUI.changed) {
                         GUI.changed = false;
                         changed = true;
                         int val;
-                        if (int.TryParse(newValue, NumberStyles.HexNumber, null, out val))
+                        if(int.TryParse(newValue, NumberStyles.HexNumber, null, out val))
                             Data[col] = unchecked((byte)val);
                     }
                     string newStr = GUI.TextField(
@@ -76,7 +76,7 @@ private void Draw(Rect viewport) {
                         Byte2String(Data[col]),
                         1, GUI.skin.label
                     );
-                    if (GUI.changed) {
+                    if(GUI.changed) {
                         GUI.changed = false;
                         changed = true;
                         Data[col] = newStr.Length > 0 ? unchecked((byte)newStr[0]) : (byte)0;
@@ -88,8 +88,8 @@ private void Draw(Rect viewport) {
         }
 
         private static string Byte2String(byte b) {
-            if (b < 32) return ((char)(b | 0x2400)).ToString();
-            if (b >= 127) return ".";
+            if(b < 32) return ((char)(b | 0x2400)).ToString();
+            if(b >= 127) return ".";
             return ((char)b).ToString();
         }
     }

UInspectorPlus/HexEdit.cs

@@ -31,29 +31,21 @@ private void OnGUI() {
             GUILayout.BeginHorizontal(EditorStyles.toolbar);
             updateProps = GUILayout.Toggle(updateProps, "Update Props", EditorStyles.toolbarButton);
             GUILayout.Space(8);
-            drawer.searchText = EditorGUILayout.TextField(drawer.searchText, Helper.GetGUIStyle("ToolbarSeachTextField"));
-            if (GUILayout.Button(
-                GUIContent.none,
-                Helper.GetGUIStyle(
-                    string.IsNullOrEmpty(drawer.searchText) ?
-                    "ToolbarSeachCancelButtonEmpty" :
-                    "ToolbarSeachCancelButton"
-                )
-            )) {
-                drawer.searchText = string.Empty;
-                GUI.FocusControl(null);
-            }
+            drawer.searchText = Helper.ToolbarSearchField(drawer.searchText ?? string.Empty);
             GUILayout.FlexibleSpace();
             GUILayout.EndHorizontal();
             scrollPos = GUILayout.BeginScrollView(scrollPos);
             EditorGUILayout.Space();
             drawer.Draw(false, isReadOnly);
-            if (drawer.changed) {
+            if(drawer.changed) {
                 drawer.changed = false;
-                if (parent != null && !parent.IsReadOnly &&
-                    ((parent.requiredType != null && parent.requiredType.IsValueType) || parent.Value != drawer.target) &&
-                    !Helper.AssignValue(parent.Info, parent.Target, drawer.target) && Helper.FetchValue(parent.Info, parent.Target, out var reverted))
-                    drawer.target = reverted;
+                if(parent != null && !parent.IsReadOnly &&
+                    ((parent.requiredType != null && parent.requiredType.IsValueType) || parent.Value != drawer.target))
+                    if(!Helper.AssignValue(parent.Info, parent.Target, drawer.target)) {
+                        object reverted;
+                        if(Helper.FetchValue(parent.Info, parent.Target, out reverted))
+                            drawer.target = reverted;
+                    }
             }
             GUILayout.FlexibleSpace();
             GUILayout.EndScrollView();
@@ -64,7 +56,7 @@ private void OnDestroy() {
         }
 
         private void OnInspectorUpdate() {
-            if (EditorGUIUtility.editingTextField)
+            if(EditorGUIUtility.editingTextField)
                 return;
             UpdateValues();
         }

UInspectorPlus/InspectorChildWindow.cs

@@ -37,19 +37,19 @@ public static void RegisterCustomInspectorDrawer<T>(Type targetType, int priorit
         }
 
         public static InspectorDrawer GetDrawer(object target, Type targetType, bool shown, bool showProps, bool showPrivateFields, bool showObsolete, bool showMethods) {
-            foreach (var type in AppDomain.CurrentDomain.GetAssemblies()
+            foreach(var type in AppDomain.CurrentDomain.GetAssemblies()
                 .SelectMany(asm => asm.GetTypes())
                 .Where(type => type.IsClass && !type.IsAbstract && type.IsSubclassOf(typeof(InspectorDrawer))))
                 RuntimeHelpers.RunClassConstructor(type.TypeHandle);
             int lastPriority = int.MinValue;
             Type drawerType = null;
             try {
-                foreach (var kv in typedDrawers)
-                    if (kv.targetType.IsAssignableFrom(targetType) && kv.priority > lastPriority)
+                foreach(var kv in typedDrawers)
+                    if(kv.targetType.IsAssignableFrom(targetType) && kv.priority > lastPriority)
                         drawerType = kv.drawerType;
-                if (drawerType != null)
+                if(drawerType != null)
                     return Activator.CreateInstance(drawerType, target, targetType, shown, showProps, showPrivateFields, showObsolete, showMethods) as InspectorDrawer;
-            } catch (Exception ex) {
+            } catch(Exception ex) {
                 Debug.LogException(ex);
                 Debug.LogWarning($"Failed to instaniate drawer {drawerType.Name}, will fall back to default drawer.");
             }
@@ -59,52 +59,52 @@ public static InspectorDrawer GetDrawer(object target, Type targetType, bool sho
         public InspectorDrawer(object target, Type targetType, bool shown, bool showProps, bool showPrivateFields, bool showObsolete, bool showMethods) {
             this.target = target;
             BindingFlags flag = BindingFlags.Static | BindingFlags.Public;
-            if (target != null)
+            if(target != null)
                 flag |= BindingFlags.Instance;
-            if (allowPrivate = showPrivateFields)
+            if(allowPrivate = showPrivateFields)
                 flag |= BindingFlags.NonPublic;
             this.targetType = targetType;
             var fields = targetType.GetFields(flag);
             var props = !showProps ? null : targetType.GetProperties(flag).Where(prop => prop.GetIndexParameters().Length == 0).ToArray();
             isInternalType = !targetType.IsSubclassOf(typeof(MonoBehaviour)) || Attribute.IsDefined(targetType, typeof(ExecuteInEditMode));
-            foreach (var field in fields)
+            foreach(var field in fields)
                 try {
-                    if (!showObsolete && Attribute.IsDefined(field, typeof(ObsoleteAttribute)))
+                    if(!showObsolete && Attribute.IsDefined(field, typeof(ObsoleteAttribute)))
                         continue;
                     drawer.Add(new MethodPropertyDrawer(field, target, showPrivateFields, showObsolete) {
                         AllowReferenceMode = false
                     });
-                } catch (Exception ex) {
+                } catch(Exception ex) {
                     Debug.LogException(ex);
                 }
-            if (showProps) {
+            if(showProps) {
                 HashSet<string> blacklistedType;
-                if (!Helper.blackListedTypes.TryGetValue(targetType, out blacklistedType)) {
+                if(!Helper.blackListedTypes.TryGetValue(targetType, out blacklistedType)) {
                     Helper.blackListedTypes.Add(targetType, blacklistedType = new HashSet<string>());
-                    foreach (var kvp in Helper.blackListedTypes)
-                        if (kvp.Key.IsAssignableFrom(targetType))
+                    foreach(var kvp in Helper.blackListedTypes)
+                        if(kvp.Key.IsAssignableFrom(targetType))
                             blacklistedType.UnionWith(kvp.Value);
                 }
-                foreach (var prop in props)
+                foreach(var prop in props)
                     try {
-                        if (blacklistedType != null && blacklistedType.Contains(prop.Name))
+                        if(blacklistedType != null && blacklistedType.Contains(prop.Name))
                             continue;
-                        if (!showObsolete && Attribute.IsDefined(prop, typeof(ObsoleteAttribute)))
+                        if(!showObsolete && Attribute.IsDefined(prop, typeof(ObsoleteAttribute)))
                             continue;
                         drawer.Add(new MethodPropertyDrawer(prop, target, showPrivateFields, showObsolete, prop.CanRead && EditorApplication.isPlaying) {
                             AllowReferenceMode = false,
                             Updatable = isInternalType || Helper.GetState(prop, false),
                             ShowUpdatable = !isInternalType
                         });
-                    } catch (Exception ex) {
+                    } catch(Exception ex) {
                         Debug.LogException(ex);
                     }
             }
-            if (allowMethods = showMethods)
+            if(allowMethods = showMethods)
                 AddMethodMenu();
-            foreach (var d in drawer)
+            foreach(var d in drawer)
                 d.OnRequireRedraw += RequireRedraw;
-            if (target != null)
+            if(target != null)
                 this.shown = Helper.GetState(target, shown);
         }
 
@@ -118,11 +118,11 @@ private void AddMethodMenu() {
         }
 
         public void Draw(bool drawHeader = true, bool readOnly = false) {
-            if (drawHeader) {
+            if(drawHeader) {
                 shown = EditorGUILayout.InspectorTitlebar(shown, target as UnityObject);
-                if (target != null)
+                if(target != null)
                     Helper.StoreState(target, shown);
-                if (!shown)
+                if(!shown)
                     return;
             }
             EditorGUI.indentLevel++;
@@ -131,80 +131,81 @@ public void Draw(bool drawHeader = true, bool readOnly = false) {
             Draw(readOnly);
             EditorGUILayout.EndVertical();
             EditorGUI.indentLevel--;
-            if (removingDrawers.Count > 0) {
-                foreach (var drawer in removingDrawers)
-                    if (drawer is IDisposable disposable)
+            if(removingDrawers.Count > 0) {
+                foreach(var drawer in removingDrawers)
+                    if(drawer is IDisposable disposable)
                         disposable.Dispose();
                 drawer.RemoveAll(removingDrawers.Contains);
                 removingDrawers.Clear();
             }
         }
 
         protected virtual void Draw(bool readOnly) {
-            foreach (var item in drawer) {
+            foreach(var item in drawer) {
                 var methodDrawer = item as ComponentMethodDrawer;
                 var fieldDrawer = item as MethodPropertyDrawer;
-                if (methodDrawer != null) {
+                if(methodDrawer != null) {
                     EditorGUI.indentLevel--;
                     EditorGUILayout.BeginHorizontal();
                     EditorGUILayout.LabelField(GUIContent.none, GUILayout.Width(EditorGUIUtility.singleLineHeight));
                     EditorGUILayout.BeginVertical();
+                    methodDrawer.Filter = searchText;
                     methodDrawer.Draw();
                     EditorGUILayout.EndVertical();
                     EditorGUILayout.EndHorizontal();
                     EditorGUI.indentLevel++;
-                } else if (item != null) {
-                    if (item.Info != null && !string.IsNullOrEmpty(searchText) && item.Info.Name.IndexOf(searchText, StringComparison.CurrentCultureIgnoreCase) < 0)
+                } else if(item != null) {
+                    if(item.Info != null && !string.IsNullOrEmpty(searchText) && item.Info.Name.IndexOf(searchText, StringComparison.CurrentCultureIgnoreCase) < 0)
                         continue;
-                    if (fieldDrawer != null)
+                    if(fieldDrawer != null)
                         fieldDrawer.Draw(readOnly);
                     else
                         item.Draw();
                     changed |= item.UpdateIfChanged();
                 }
             }
-            if (allowMethods) {
+            if(allowMethods) {
                 GUILayout.BeginHorizontal();
                 GUILayout.FlexibleSpace();
-                if (GUILayout.Button(new GUIContent("+", "Add Method / Index Properties Watcher"), EditorStyles.miniButton, GUILayout.ExpandWidth(false)))
+                if(GUILayout.Button(new GUIContent("+", "Add Method / Index Properties Watcher"), EditorStyles.miniButton, GUILayout.ExpandWidth(false)))
                     AddMethodMenu();
                 GUILayout.EndHorizontal();
             }
         }
 
         private void DrawRequestRefs() {
             MethodPropertyDrawer removal = null;
-            foreach (var drawer in MethodPropertyDrawer.drawerRequestingReferences)
-                if (drawer.requiredType.IsAssignableFrom(targetType) &&
+            foreach(var drawer in MethodPropertyDrawer.drawerRequestingReferences)
+                if(drawer.requiredType.IsAssignableFrom(targetType) &&
                     GUILayout.Button($"Assign this object to {drawer.name}")) {
                     drawer.Value = target;
                     removal = drawer;
                 }
-            if (removal != null) MethodPropertyDrawer.drawerRequestingReferences.Remove(removal);
+            if(removal != null) MethodPropertyDrawer.drawerRequestingReferences.Remove(removal);
         }
 
         public void UpdateValues(bool updateProps) {
-            if (target == null) return;
-            foreach (var drawerItem in drawer) {
+            if(target == null) return;
+            foreach(var drawerItem in drawer) {
                 var propDrawer = drawerItem as MethodPropertyDrawer;
-                if (propDrawer == null)
+                if(propDrawer == null)
                     continue;
                 var isPropInfo = propDrawer.Info is PropertyInfo;
-                if (!isInternalType && (!updateProps || !propDrawer.Updatable) && isPropInfo)
+                if(!isInternalType && (!updateProps || !propDrawer.Updatable) && isPropInfo)
                     continue;
                 propDrawer.UpdateValue();
             }
         }
 
         public virtual void Dispose() {
-            foreach (var d in drawer)
-                if (d is IDisposable disposable)
+            foreach(var d in drawer)
+                if(d is IDisposable disposable)
                     disposable.Dispose();
             drawer.Clear();
         }
 
         protected void RequireRedraw() {
-            if (target != null && OnRequireRedraw != null)
+            if(target != null && OnRequireRedraw != null)
                 OnRequireRedraw();
         }
     }