подсчет вхождений Колонок в Индекс: корректное удаление

Author: Mr-Rm

src/OneScript.StandardLibrary/Collections/Indexes/CollectionIndex.cs

@@ -18,7 +18,7 @@ namespace OneScript.StandardLibrary.Collections.Indexes
     [ContextClass("ИндексКоллекции", "CollectionIndex")]
     public class CollectionIndex : AutoCollectionContext<CollectionIndex, IValue>
     {
-        readonly List<IValue> _fields = new List<IValue>();
+        private readonly List<IValue> _fields = new List<IValue>();
         private readonly IIndexCollectionSource _source;
 
         private readonly Dictionary<CollectionIndexKey, HashSet<IValue>> _data =
@@ -29,7 +29,7 @@ public CollectionIndex(IIndexCollectionSource source, IEnumerable<IValue> fields
             foreach (var field in fields)
             {
                 if (field is ValueTable.ValueTableColumn column) 
-                    column.IsIndexable = true;
+                    column.AddToIndex();
                 _fields.Add(field);
             }
 
@@ -65,11 +65,26 @@ internal void FieldRemoved(IValue field)
         {
             if (_fields.Contains(field))
             {
-                while (_fields.Contains(field)) _fields.Remove(field);
+                while (_fields.Contains(field))
+                {
+                    if (field is ValueTable.ValueTableColumn column)
+                        column.DeleteFromIndex();
+
+                    _fields.Remove(field);
+                }
                 Rebuild();
             }
         }
 
+        internal void ExcludeFields()
+        {
+            foreach (var field in _fields)
+            {
+                if (field is ValueTable.ValueTableColumn column)
+                    column.AddToIndex();
+            }
+        }
+
         internal void ElementAdded(PropertyNameIndexAccessor element)
         {
             var key = CollectionIndexKey.Extract(element, _fields);

src/OneScript.StandardLibrary/Collections/ValueTable/CollectionIndexes.cs

@@ -45,12 +45,17 @@ public override int Count()
         [ContextMethod("Удалить", "Delete")]
         public void Delete(IValue index)
         {
-            _indexes.Remove(GetIndex(index));
+            var idx = GetIndex(index);
+            idx.ExcludeFields();
+            _indexes.Remove(idx);
         }
 
         [ContextMethod("Очистить", "Clear")]
         public void Clear()
         {
+            foreach (var idx in _indexes)
+                idx.ExcludeFields();
+
             _indexes.Clear();
         }
 

src/OneScript.StandardLibrary/Collections/ValueTable/ValueTableColumn.cs

@@ -20,19 +20,21 @@ namespace OneScript.StandardLibrary.Collections.ValueTable
     public class ValueTableColumn : AutoContext<ValueTableColumn>
     {
         private string _title;
-        private string _name;
+        private string _name;
         private readonly TypeDescription _valueType;
         private readonly WeakReference _owner;
 
-        public bool IsIndexable { get; internal set; }
-        
+        private int _indicesCount = 0;
+        public bool IsIndexable => _indicesCount != 0;
+        public void AddToIndex() { _indicesCount++; }
+        public void DeleteFromIndex() { if (_indicesCount != 0) _indicesCount--; }
+
         public ValueTableColumn(ValueTableColumnCollection owner, string name, string title, TypeDescription type, int width)
         {
             _name = name;
             _title = title;
             _valueType = type ?? new TypeDescription();
             Width = width;
-            IsIndexable = false;
 
             _owner = new WeakReference(owner);
         }