Add Command variables container

Author: JustinGrote

src/PowerShellEditorServices/Services/DebugAdapter/DebugService.cs

@@ -609,10 +609,12 @@ public VariableScope[] GetVariableScopes(int stackFrameId)
         {
             var stackFrames = GetStackFrames();
             int autoVariablesId = stackFrames[stackFrameId].AutoVariables.Id;
+            int commandVariablesId = stackFrames[stackFrameId].CommandVariables.Id;
 
             return new VariableScope[]
             {
                 new VariableScope(autoVariablesId, VariableContainerDetails.AutoVariablesName),
+                new VariableScope(commandVariablesId, VariableContainerDetails.CommandVariablesName),
                 new VariableScope(localScopeVariables.Id, VariableContainerDetails.LocalScopeName),
                 new VariableScope(scriptScopeVariables.Id, VariableContainerDetails.ScriptScopeName),
                 new VariableScope(globalScopeVariables.Id, VariableContainerDetails.GlobalScopeName),
@@ -810,6 +812,12 @@ private async Task FetchStackFramesAsync(string scriptNameOverride)
 
                 variables.Add(autoVariables);
 
+                var commandVariables = new VariableContainerDetails(
+                    nextVariableId++,
+                    VariableContainerDetails.CommandVariablesName);
+
+                variables.Add(commandVariables);
+
                 foreach (DictionaryEntry entry in callStackVariables)
                 {
                     // TODO: This should be deduplicated into a new function.
@@ -823,13 +831,14 @@ private async Task FetchStackFramesAsync(string scriptNameOverride)
                     var variableDetails = new VariableDetails(psVarName, psVarValue) { Id = nextVariableId++ };
                     variables.Add(variableDetails);
 
+                    commandVariables.Children.Add(variableDetails.Name, variableDetails);
                     if (AddToAutoVariables(new PSObject(entry.Value)))
                     {
                         autoVariables.Children.Add(variableDetails.Name, variableDetails);
                     }
                 }
 
-                var stackFrameDetailsEntry = StackFrameDetails.Create(callStackFrame, autoVariables);
+                var stackFrameDetailsEntry = StackFrameDetails.Create(callStackFrame, autoVariables, commandVariables);
 
                 string stackFrameScriptPath = stackFrameDetailsEntry.ScriptPath;
                 if (scriptNameOverride is not null

src/PowerShellEditorServices/Services/DebugAdapter/Debugging/StackFrameDetails.cs

@@ -64,6 +64,11 @@ internal class StackFrameDetails
         /// </summary>
         public VariableContainerDetails AutoVariables { get; private set; }
 
+        /// <summary>
+        /// Gets or sets the VariableContainerDetails that contains the call stack frame variables.
+        /// </summary>
+        public VariableContainerDetails CommandVariables { get; private set; }
+
         #endregion
 
         #region Constructors
@@ -81,7 +86,8 @@ internal class StackFrameDetails
         /// <returns>A new instance of the StackFrameDetails class.</returns>
         static internal StackFrameDetails Create(
             PSObject callStackFrameObject,
-            VariableContainerDetails autoVariables)
+            VariableContainerDetails autoVariables,
+            VariableContainerDetails commandVariables)
         {
             string scriptPath = (callStackFrameObject.Properties["ScriptName"].Value as string) ?? NoFileScriptPath;
             int startLineNumber = (int)(callStackFrameObject.Properties["ScriptLineNumber"].Value ?? 0);
@@ -95,6 +101,7 @@ static internal StackFrameDetails Create(
                 StartColumnNumber = 0, // Column number isn't given in PowerShell stack frames
                 EndColumnNumber = 0,
                 AutoVariables = autoVariables,
+                CommandVariables = commandVariables,
                 // TODO: Re-enable `isExternal` detection along with a setting. Will require
                 // `workspaceRootPath`, see Git blame.
                 IsExternalCode = false

src/PowerShellEditorServices/Services/DebugAdapter/Debugging/VariableContainerDetails.cs

@@ -20,17 +20,22 @@ namespace Microsoft.PowerShell.EditorServices.Services.DebugAdapter
     internal class VariableContainerDetails : VariableDetailsBase
     {
         /// <summary>
-        /// Provides a constant for the name of the Global scope.
+        /// Provides a constant for the name of the filtered auto variables.
         /// </summary>
         public const string AutoVariablesName = "Auto";
 
         /// <summary>
-        /// Provides a constant for the name of the Global scope.
+        /// Provides a constant for the name of the current stack frame variables.
+        /// </summary>
+        public const string CommandVariablesName = "Command";
+
+        /// <summary>
+        /// Provides a constant for the name of the global scope variables.
         /// </summary>
         public const string GlobalScopeName = "Global";
 
         /// <summary>
-        /// Provides a constant for the name of the Local scope.
+        /// Provides a constant for the name of the local scope variables.
         /// </summary>
         public const string LocalScopeName = "Local";