Fix regression with F5 to use . instead of & operator

This also corrects the scope of the script's parameter variables to be
`Local` instead of `Command` in the `DebuggerAcceptsScriptArgs` test, as
it was prior to v3.0.

Author: andyleejordan

src/PowerShellEditorServices/Services/DebugAdapter/DebugService.cs

@@ -45,7 +45,7 @@ internal class DebugService
         private int nextVariableId;
         private string temporaryScriptListingPath;
         private List<VariableDetailsBase> variables;
-        internal VariableContainerDetails globalScopeVariables; // Internal for unit testing.
+        private VariableContainerDetails globalScopeVariables;
         private VariableContainerDetails scriptScopeVariables;
         private VariableContainerDetails localScopeVariables;
         private StackFrameDetails[] stackFrameDetails;

src/PowerShellEditorServices/Utility/PSCommandExtensions.cs

@@ -137,7 +137,7 @@ public static PSCommand BuildCommandFromArguments(string command, IReadOnlyList<
             // HACK: We use AddScript instead of AddArgument/AddParameter to reuse Powershell parameter binding logic.
             // We quote the command parameter so that expressions can still be used in the arguments.
             var sb = new StringBuilder()
-                .Append('&')
+                .Append('.')
                 .Append(' ')
                 .Append('"')
                 .Append(command)

test/PowerShellEditorServices.Test/Debugging/DebugServiceTests.cs

@@ -158,7 +158,10 @@ await debugService.SetCommandBreakpointsAsync(
 
             StackFrameDetails[] stackFrames = await debugService.GetStackFramesAsync().ConfigureAwait(true);
             Assert.Equal(StackFrameDetails.NoFileScriptPath, stackFrames[0].ScriptPath);
-            VariableDetailsBase[] variables = debugService.GetVariables(debugService.globalScopeVariables.Id);
+
+            VariableScope[] scopes = debugService.GetVariableScopes(0);
+            VariableScope globalScope = Array.Find(scopes, s => s.Name == VariableContainerDetails.GlobalScopeName);
+            VariableDetailsBase[] variables = debugService.GetVariables(globalScope.Id);
 
             // NOTE: This assertion will fail if any error occurs. Notably this happens in testing
             // when the assembly path changes and the commands definition file can't be found.
@@ -197,8 +200,9 @@ public async Task DebuggerAcceptsScriptArgs()
 
             AssertDebuggerStopped(debugWithParamsFile.FilePath, 3);
 
-            StackFrameDetails[] stackFrames = await debugService.GetStackFramesAsync().ConfigureAwait(true);
-            VariableDetailsBase[] variables = debugService.GetVariables(stackFrames[0].AutoVariables.Id);
+            VariableScope[] scopes = debugService.GetVariableScopes(0);
+            VariableScope localScope = Array.Find(scopes, s => s.Name == VariableContainerDetails.LocalScopeName);
+            VariableDetailsBase[] variables = debugService.GetVariables(localScope.Id);
 
             var var = Array.Find(variables, v => v.Name == "$Param1");
             Assert.NotNull(var);
@@ -220,6 +224,7 @@ public async Task DebuggerAcceptsScriptArgs()
             Assert.True(var.IsExpandable);
 
             // NOTE: $args are no longer found in AutoVariables but CommandVariables instead.
+            StackFrameDetails[] stackFrames = await debugService.GetStackFramesAsync().ConfigureAwait(true);
             variables = debugService.GetVariables(stackFrames[0].CommandVariables.Id);
             var = Array.Find(variables, v => v.Name == "$args");
             Assert.NotNull(var);
@@ -618,9 +623,8 @@ await debugService.SetLineBreakpointsAsync(
             debugService.StepOver();
             AssertDebuggerStopped(variableScriptFile.FilePath);
 
-            stackFrames = await debugService.GetStackFramesAsync().ConfigureAwait(true);
-
             // Test set of a local string variable (not strongly typed)
+            stackFrames = await debugService.GetStackFramesAsync().ConfigureAwait(true);
             variables = debugService.GetVariables(stackFrames[0].AutoVariables.Id);
             var strVar = Array.Find(variables, v => v.Name == "$strVar");
             Assert.Equal(newStrValue, strVar.ValueString);
@@ -682,9 +686,8 @@ await debugService.SetLineBreakpointsAsync(
             debugService.StepOver();
             AssertDebuggerStopped(variableScriptFile.FilePath);
 
-            stackFrames = await debugService.GetStackFramesAsync().ConfigureAwait(true);
-
             // Test set of a local string variable (not strongly typed but force conversion)
+            stackFrames = await debugService.GetStackFramesAsync().ConfigureAwait(true);
             variables = debugService.GetVariables(stackFrames[0].AutoVariables.Id);
             var strVar = Array.Find(variables, v => v.Name == "$strVar2");
             Assert.Equal(newStrValue, strVar.ValueString);