Merge pull request #47 from techno-dwarf-works/feature/refactoring

Version 0.0.44
techno-dwarf-works · Aug 23, 2024 · a742f57 · a742f57
1 parent 8fa9f8b
commit a742f57
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/Editor/Extensions/SerializedPropertyExtensions.cs b/Editor/Extensions/SerializedPropertyExtensions.cs
@@ -119,6 +119,10 @@ public static CachedFieldInfo GetFieldInfoAndStaticTypeFromProperty(this Seriali
                 }
 
                 fieldPath = self.propertyPath;
+                if (classType != null)
+                {
+                    SerializedPropertyUtility.CleanCacheForProperty(classType, fieldPath);
+                }
             }
 
             if (classType == null)

diff --git a/Editor/Utility/SerializedPropertyUtility.cs b/Editor/Utility/SerializedPropertyUtility.cs
@@ -68,6 +68,14 @@ public static bool GetTypeFromManagedReferenceFullTypeName(string managedReferen
             return managedReferenceInstanceType != null;
         }
 
+        public static void CleanCacheForProperty(Type type, string propertyPath)
+        {
+            propertyPath = ArrayDataWithIndexRegex.Replace(propertyPath, ArrayElementDotName);
+            var cache = new CachePropertyKey(type, propertyPath);
+
+            FieldInfoFromPropertyPathCache.Remove(cache);
+        }
+
         public static CachedFieldInfo GetFieldInfoFromPropertyPath(Type type, string propertyPath)
         {
             var arrayElement = ArrayDataWithIndexRegexAny.IsMatch(propertyPath);
@@ -118,9 +126,17 @@ private static bool FieldInfoFromPropertyPath(string propertyPath, ref Type type
                 fieldInfo = foundField;
                 type = fieldInfo.FieldType;
 
-                if (i >= parts.Length - 1 || parts[i + 1] != ArrayElementName || !type.IsArrayOrList()) continue;
+                if (i >= parts.Length - 1 || parts[i + 1] != ArrayElementName || !type.IsArrayOrList())
+                {
+                    continue;
+                }
                 i++;
                 type = type.GetCollectionElementType();
+
+                if (fieldInfo != null)
+                {
+                    return false;
+                }
             }
 
             return false;

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "com.tdw.better.commons",
   "displayName": "Better Commons",
-  "version": "0.0.43",
+  "version": "0.0.44",
   "unity": "2021.3",
   "description": " ",
   "dependencies": {