Рефакторинг контейнеров переменных

Author: EvilBeaver

src/OneScript.DebugProtocol/EvaluatedVariableLocator.cs

@@ -5,15 +5,13 @@ This Source Code Form is subject to the terms of the
 at http://mozilla.org/MPL/2.0/.
 ----------------------------------------------------------*/
 using System;
-using System.Collections;
-using System.Collections.Generic;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 
 namespace OneScript.DebugProtocol
 {
     [DataContract, JsonObject, Serializable]
-    public class StackFrame : IVariableLocator
+    public class StackFrame
     {
         [DataMember]
         public int Index { get; set; }
@@ -27,85 +25,6 @@ public class StackFrame : IVariableLocator
         [DataMember]
         public string Source { get; set; }
 
-        [DataMember]
-        public Variable[] Variables { get; set; }
-
         public int ThreadId { get; set; }
-
-        int IVariableLocator.Count
-        {
-            get
-            {
-                if (Variables == null)
-                    return 0;
-                
-                return Variables.Length;
-            }
-        }
-
-        Variable IVariableLocator.this[int index]
-        {
-            get
-            {
-                if (Variables == null)
-                    throw new ArgumentOutOfRangeException();
-                
-                return Variables[index];
-            }
-        }
-
-        IEnumerator<Variable> IEnumerable<Variable>.GetEnumerator()
-        {
-            if (Variables == null)
-            {
-                return EmptyEnumerator<Variable>.Instance;
-            }
-
-            return ((IEnumerable<Variable>)Variables).GetEnumerator();
-        }
-
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return ((IVariableLocator) this).GetEnumerator();
-        }
-
-        void IVariableLocator.Hydrate(IDebuggerService process)
-        {
-            if (Variables != null)
-                return;
-            var variables = process.GetVariables(ThreadId, Index, Array.Empty<int>());
-            Variables = variables;
-        }
-
-        public IVariableLocator CreateChildLocator(int variableIndex)
-        {
-            return new VariableLocator(ThreadId, Index, variableIndex);
-        }
-    }
-    
-    internal class EmptyEnumerator<T> : IEnumerator<T>
-    {
-        public static EmptyEnumerator<T> Instance { get; } = new EmptyEnumerator<T>();
-        
-        private EmptyEnumerator()
-        {
-        }
-
-        public bool MoveNext()
-        {
-            return false;
-        }
-
-        public void Reset()
-        {
-        }
-
-        public T Current { get; } = default;
-
-        object IEnumerator.Current => Current;
-
-        public void Dispose()
-        {
-        }
     }
 }

src/OneScript.DebugProtocol/StackFrame.cs

@@ -362,9 +362,9 @@ public StackFrame[] GetStackTrace(int threadId, int firstFrameIdx, int limit)
 
         }
 
-        public void FillVariables(IVariableLocator locator)
+        public Variable[] FetchVariables(IVariablesProvider provider)
         {
-            locator.Hydrate(_debugger);
+            return provider.FetchVariables(_debugger);
         }
 
         public Variable Evaluate(StackFrame frame, string expression)