Fix convention to follow project, Fix ReadOnly errors, Fix OnEnabled …

…never been called

CommonUDictionaries.cs

@@ -1,5 +1,4 @@
 using System;
-using UnityEngine;
 
 namespace UnityEngine.Collections.Generic
 {

Editor/UDictionaryDrawer.cs

@@ -7,20 +7,19 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
-using UnityEditor;
+using Unity.Collections;
 using UnityEditorInternal;
 using UnityEngine;
-using UnityEngine.Collections;
 using UnityEngine.Collections.Generic;
 
 namespace UnityEditor.Collections.Generic
 {
     [CustomPropertyDrawer(typeof(UDictionaryBase), true)]
     public class UDictionaryDrawer : PropertyDrawer
     {
-        const string DuplicatedKeyErrorMessage = "You have duplicated keys, some changes can be lost!";
-        const string KeyTypeErrorMessage = "The key type does not support serialization";
-        const string ValueTypeErrorMessage = "The value type does not support serialization";
+        private const string DuplicatedKeyErrorMessage = "You have duplicated keys, some changes can be lost!";
+        private const string KeyTypeErrorMessage = "The key type does not support serialization";
+        private const string ValueTypeErrorMessage = "The value type does not support serialization";
 
         private bool isEnabled = false;
         private readonly float space = 17;
@@ -43,7 +42,7 @@ public class UDictionaryDrawer : PropertyDrawer
         protected SerializedProperty KeysProperty { get; private set; }
         protected SerializedProperty ValuesProperty { get; private set; }
 
-        protected bool IsDragging { get { return (bool)RList.GetType().GetField("m_Dragging", privateInstanceFlags).GetValue(RList); } }
+        protected bool IsDragging => (bool)RList.GetType().GetField("m_Dragging", privateInstanceFlags).GetValue(RList);
 
         public sealed override bool CanCacheInspectorGUI(SerializedProperty property)
         {
@@ -55,10 +54,7 @@ public sealed override bool CanCacheInspectorGUI(SerializedProperty property)
             return base.CanCacheInspectorGUI(property);
         }
 
-        public override float GetPropertyHeight(SerializedProperty property, GUIContent label)
-        {
-            return foldoutRList ? (RList != null ? RList.GetHeight() : 0) + space : space;
-        }
+        public override float GetPropertyHeight(SerializedProperty property, GUIContent label) => foldoutRList ? (RList != null ? RList.GetHeight() : 0) + space : space;
 
         private void OnEnable(SerializedProperty property)
         {
@@ -86,14 +82,26 @@ protected virtual void InitializeRedBoxVariables()
 
         public override void OnGUI(Rect rect, SerializedProperty property, GUIContent label)
         {
+            if (!isEnabled)
+            {
+                // this shouldn't be here, but since CanCacheInspectorGUI is apparently not called
+                // there is not currently way to call this just on enabled
+                OnEnable(property);
+            }
             foldoutRList = EditorGUI.Foldout(new Rect(rect.position, new Vector2(rect.size.x, space)), foldoutRList, label, true);
-            if(KeysProperty == null)
+            if (KeysProperty == null)
+            {
                 DrawErrorMessage(rect, property.name.Length, KeyTypeErrorMessage);
-            else if(ValuesProperty == null)
+            }
+            else if (ValuesProperty == null)
+            {
                 DrawErrorMessage(rect, property.name.Length, ValueTypeErrorMessage);
+            }
             else if (hasDuplicatedKey)
+            {
                 DrawErrorMessage(rect, property.name.Length, DuplicatedKeyErrorMessage);
-
+            }
+
             if (foldoutRList && RList != null)
             {
                 hasDuplicatedKey = false;
@@ -117,23 +125,17 @@ protected void InitializeList(SerializedProperty prop)
             }
         }
 
-        protected virtual ReorderableList CreateList(SerializedObject serializedObj, SerializedProperty elements)
-        {
-            return new ReorderableList(serializedObj, elements, !isReadOnly, true, !isReadOnly, !isReadOnly)
-            {
+        protected virtual ReorderableList CreateList(SerializedObject serializedObj, SerializedProperty elements) => 
+            new ReorderableList(serializedObj, elements, !isReadOnly, true, !isReadOnly, !isReadOnly) {
                 drawHeaderCallback = DrawHeader,
                 onAddCallback = OnAdd,
                 onRemoveCallback = OnRemove,
                 onReorderCallback = OnReorder,
                 elementHeightCallback = GetReorderableElementHeight,
                 drawElementCallback = DrawElement,
             };
-        }
 
-        protected void DrawHeader(Rect rect)
-        {
-            EditorGUI.LabelField(rect, fieldInfo.Name);
-        }
+        protected void DrawHeader(Rect rect) => EditorGUI.LabelField(rect, fieldInfo.Name);
 
         protected void OnAdd(ReorderableList list)
         {
@@ -148,15 +150,9 @@ protected void OnRemove(ReorderableList list)
             ValuesProperty.DeleteArrayElementAtIndex(SelectedIndex);
         }
 
-        protected void OnReorder(ReorderableList list)
-        {
-            ValuesProperty.MoveArrayElement(SelectedIndex, list.index);
-        }
+        protected void OnReorder(ReorderableList list) => ValuesProperty.MoveArrayElement(SelectedIndex, list.index);
 
-        private void OnSelect(ReorderableList list)
-        {
-            SelectedIndex = list.index;
-        }
+        private void OnSelect(ReorderableList list) => SelectedIndex = list.index;
 
         protected float GetReorderableElementHeight(int index)
         {
@@ -229,15 +225,12 @@ protected GUIContent GUIContent(string text)
 
 
         private bool wasEnabled;
-        protected virtual void OnBeforeDrawProperties() 
+        protected virtual void OnBeforeDrawProperties()
         {
             wasEnabled = GUI.enabled;
             GUI.enabled = !isReadOnly;
         }
 
-        protected virtual void OnAfterDrawProperties()
-        {
-            GUI.enabled = wasEnabled;
-        }
+        protected virtual void OnAfterDrawProperties() => GUI.enabled = wasEnabled;
     }
 }

Editor/UDictionaryExtensions.cs

@@ -7,7 +7,6 @@
 using System;
 using System.Collections;
 using System.Reflection;
-using UnityEditor;
 
 namespace UnityEditor.Collections.Generic
 {

Editor/UDictionaryReadKeyDrawer.cs

@@ -4,7 +4,6 @@
 *   Repository: https://github.com/Prastiwar/UnitySerializedDictionary
 */
 
-using UnityEditor;
 using UnityEngine;
 
 namespace UnityEditor.Collections.Generic

HashHelpers.cs

@@ -1,12 +1,11 @@
 using System;
 using System.Runtime.ConstrainedExecution;
 
-
 namespace Unity.Collections
 {
     public static class HashHelpers
     {
-        public const Int32 HashPrime = 101;
+        public const int HashPrime = 101;
 
         // Table of prime numbers to use as hash table sizes. 
         // A typical resize algorithm would pick the smallest prime number in this array
@@ -36,7 +35,9 @@ public static bool IsPrime(int candidate)
                 for (int divisor = 3; divisor <= limit; divisor += 2)
                 {
                     if ((candidate % divisor) == 0)
+                    {
                         return false;
+                    }
                 }
                 return true;
             }
@@ -47,28 +48,32 @@ public static bool IsPrime(int candidate)
         public static int GetPrime(int min)
         {
             if (min < 0)
+            {
                 throw new ArgumentException();
+            }
 
             for (int i = 0; i < primes.Length; i++)
             {
                 int prime = primes[i];
-                if (prime >= min) return prime;
+                if (prime >= min)
+                {
+                    return prime;
+                }
             }
 
             //outside of our predefined table. 
             //compute the hard way. 
-            for (int i = (min | 1); i < Int32.MaxValue; i += 2)
+            for (int i = (min | 1); i < int.MaxValue; i += 2)
             {
                 if (IsPrime(i) && ((i - 1) % HashPrime != 0))
+                {
                     return i;
+                }
             }
             return min;
         }
 
-        public static int GetMinPrime()
-        {
-            return primes[0];
-        }
+        public static int GetMinPrime() => primes[0];
 
         // Returns size of hashtable to grow to.
         public static int ExpandPrime(int oldSize)
@@ -81,7 +86,6 @@ public static int ExpandPrime(int oldSize)
             {
                 return MaxPrimeArrayLength;
             }
-
             return GetPrime(newSize);
         }