fix: PR comments

Author: brunomikoski

Scripts/Editor/Processors/SOCItemGuidProcessor.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using UnityEditor;
 
@@ -66,11 +66,32 @@ private static void RemoveFromIndex(ScriptableObjectCollectionItem item)
             LongGuid guid = item.GUID;
             if (!guid.IsValid())
                 return;
-            
+
             if (PathByGuid.TryGetValue(guid, out string existing) && existing == AssetDatabase.GetAssetPath(item))
                 PathByGuid.Remove(guid);
         }
 
+        private static void RemoveFromIndexByPath(string path)
+        {
+            if (!indexInitialized)
+                return;
+
+            LongGuid keyToRemove = default;
+            bool found = false;
+            foreach (var kvp in PathByGuid)
+            {
+                if (string.Equals(kvp.Value, path, System.StringComparison.Ordinal))
+                {
+                    keyToRemove = kvp.Key;
+                    found = true;
+                    break;
+                }
+            }
+
+            if (found)
+                PathByGuid.Remove(keyToRemove);
+        }
+
         private static void OnPostprocessAllAssets(
             string[] importedAssets,
             string[] deletedAssets,
@@ -81,9 +102,7 @@ private static void OnPostprocessAllAssets(
 
             foreach (string del in deletedAssets)
             {
-                ScriptableObjectCollectionItem item = AssetDatabase.LoadAssetAtPath<ScriptableObjectCollectionItem>(del);
-                if (item != null)
-                    RemoveFromIndex(item);
+                RemoveFromIndexByPath(del);
             }
 
             foreach (string path in importedAssets)

Scripts/Editor/Processors/SOCItemGuidProcessor.cs.meta

@@ -453,14 +453,25 @@ private static bool HasItemIntersection(HashSet<(long, long)> a, HashSet<(long,
 
         private static bool IsCombinationImpossible(int matchA, int matchB)
         {
-            // 0 = Any, 1 = All (positive) | 2 = SomeNot, 3 = None (negative)
-            // Invalid only when the same tag is in a positive and a negative rule.
-            bool aPositive = matchA is 0 or 1;
-            bool bPositive = matchB is 0 or 1;
-            bool aNegative = matchA is 2 or 3;
-            bool bNegative = matchB is 2 or 3;
-
-            if ((aPositive && bNegative) || (aNegative && bPositive))
+            // 0 = Any, 1 = All, 2 = SomeNot (forbids any), 3 = None (forbids all)
+            // Only truly impossible when overlapping items can never satisfy both rules:
+            // - All + SomeNot: must have all AND must have none → impossible
+            // - Any + SomeNot: must have at least one AND must have none → impossible
+            // - All + None: must have all AND must not have all → impossible
+            // - Any + None: must have at least one AND must not have all → satisfiable (partial overlap ok)
+            int lo = Mathf.Min(matchA, matchB);
+            int hi = Mathf.Max(matchA, matchB);
+
+            // All(1) + SomeNot(2)
+            if (lo == 1 && hi == 2)
+                return true;
+
+            // Any(0) + SomeNot(2)
+            if (lo == 0 && hi == 2)
+                return true;
+
+            // All(1) + None(3)
+            if (lo == 1 && hi == 3)
                 return true;
 
             return false;

Scripts/Editor/PropertyDrawers/CollectionItemQueryPropertyDrawer.cs

@@ -250,8 +250,13 @@ public ScriptableObjectCollection GetCollectionByGUID(LongGuid guid)
             if (collectionGuidLookup.Count == 0 && collections.Count > 0)
                 RebuildGuidLookup();
 
-            if (collectionGuidLookup.TryGetValue(guid, out ScriptableObjectCollection cached) && cached != null)
-                return cached;
+            if (collectionGuidLookup.TryGetValue(guid, out ScriptableObjectCollection cached))
+            {
+                if (cached != null && cached.GUID == guid)
+                    return cached;
+
+                collectionGuidLookup.Remove(guid);
+            }
 
             for (int i = 0; i < collections.Count; i++)
             {

Scripts/Runtime/Core/CollectionsRegistry.cs

@@ -505,8 +505,13 @@ public bool TryGetItemByGUID<T>(LongGuid itemGUID, out T scriptableObjectCollect
             {
                 if (itemGuidToScriptableObject.TryGetValue(itemGUID, out ScriptableObject cached))
                 {
-                    scriptableObjectCollectionItem = cached as T;
-                    return scriptableObjectCollectionItem != null;
+                    if (cached != null && cached is ISOCItem cachedSocItem && cachedSocItem.GUID == itemGUID)
+                    {
+                        scriptableObjectCollectionItem = cached as T;
+                        return scriptableObjectCollectionItem != null;
+                    }
+
+                    itemGuidToScriptableObject.Remove(itemGUID);
                 }
 
                 for (int i = 0; i < items.Count; i++)
@@ -719,6 +724,7 @@ IEnumerator IEnumerable.GetEnumerator()
 
         protected override void ClearCachedValues()
         {
+            base.ClearCachedValues();
             cachedValues = null;
         }
     }