Make BuildCommandFromArguments() reusable

Author: andyleejordan

src/PowerShellEditorServices/Services/DebugAdapter/Handlers/ConfigurationDoneHandler.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation.
+// Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
 using Microsoft.Extensions.Logging;
@@ -13,10 +13,8 @@
 using OmniSharp.Extensions.DebugAdapter.Protocol.Events;
 using OmniSharp.Extensions.DebugAdapter.Protocol.Requests;
 using OmniSharp.Extensions.DebugAdapter.Protocol.Server;
-using System.Collections.Generic;
 using System.Management.Automation;
 using System.Management.Automation.Language;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -140,38 +138,13 @@ await _executionService
             {
                 await _executionService
                     .ExecutePSCommandAsync(
-                        BuildPSCommandFromArguments(scriptToLaunch, _debugStateService.Arguments),
+                        PSCommandHelpers.BuildCommandFromArguments(scriptToLaunch, _debugStateService.Arguments),
                         CancellationToken.None,
                         s_debuggerExecutionOptions)
                     .ConfigureAwait(false);
             }
 
             _debugAdapterServer.SendNotification(EventNames.Terminated);
         }
-
-        private static PSCommand BuildPSCommandFromArguments(string command, IReadOnlyList<string> arguments)
-        {
-            if (arguments is null or { Count: 0 })
-            {
-                return new PSCommand().AddCommand(command);
-            }
-
-            // 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(command)
-                .Append('"');
-
-            foreach (string arg in arguments)
-            {
-                sb
-                .Append(' ')
-                .Append(ArgumentEscaping.Escape(arg));
-            }
-
-            return new PSCommand().AddScript(sb.ToString());
-        }
     }
 }

src/PowerShellEditorServices/Utility/PSCommandExtensions.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq.Expressions;
 using System.Management.Automation;
@@ -11,11 +12,11 @@
 
 namespace Microsoft.PowerShell.EditorServices.Utility
 {
-    internal static class PSCommandExtensions
+    internal static class PSCommandHelpers
     {
         private static readonly Func<CommandInfo, Command> s_commandCtor;
 
-        static PSCommandExtensions()
+        static PSCommandHelpers()
         {
             var ctor = typeof(Command).GetConstructor(
                 BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public,
@@ -31,9 +32,14 @@ static PSCommandExtensions()
                 .Compile();
         }
 
-        // PowerShell's missing an API for us to AddCommand using a CommandInfo.
-        // An issue was filed here: https://github.com/PowerShell/PowerShell/issues/12295
-        // This works around this by creating a `Command` and passing it into PSCommand.AddCommand(Command command)
+        /// <summary>
+        /// PowerShell's missing an API for us to AddCommand using a CommandInfo.
+        /// An issue was filed here: https://github.com/PowerShell/PowerShell/issues/12295
+        /// This works around this by creating a `Command` and passing it into PSCommand.AddCommand(Command command)
+        /// </summary>
+        /// <param name="command"></param>
+        /// <param name="commandInfo"></param>
+        /// <returns></returns>
         public static PSCommand AddCommand(this PSCommand command, CommandInfo commandInfo)
         {
             var rsCommand = s_commandCtor(commandInfo);
@@ -81,6 +87,7 @@ public static PSCommand AddProfileLoadIfExists(this PSCommand psCommand, PSObjec
         /// <summary>
         /// Get a representation of the PSCommand, for logging purposes.
         /// </summary>
+        /// <param name="command"></param>
         public static string GetInvocationText(this PSCommand command)
         {
             Command currentCommand = command.Commands[0];
@@ -119,5 +126,31 @@ private static StringBuilder AddCommandText(this StringBuilder sb, Command comma
 
             return sb;
         }
+
+        public static PSCommand BuildCommandFromArguments(string command, IReadOnlyList<string> arguments)
+        {
+            if (arguments is null or { Count: 0 })
+            {
+                return new PSCommand().AddCommand(command);
+            }
+
+            // 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(command)
+                .Append('"');
+
+            foreach (string arg in arguments)
+            {
+                sb
+                .Append(' ')
+                .Append(ArgumentEscaping.Escape(arg));
+            }
+
+            return new PSCommand().AddScript(sb.ToString());
+        }
     }
 }