Correctly escape path to script

Author: Robert Holt

src/PowerShellEditorServices.Protocol/Server/DebugAdapter.cs

@@ -259,7 +259,6 @@ protected async Task HandleLaunchRequest(
                 // the path exists and is a directory.
                 if (!string.IsNullOrEmpty(workingDir))
                 {
-                    workingDir = PowerShellContext.UnescapeWildcardEscapedPath(workingDir);
                     try
                     {
                         if ((File.GetAttributes(workingDir) & FileAttributes.Directory) != FileAttributes.Directory)
@@ -303,7 +302,16 @@ protected async Task HandleLaunchRequest(
             string arguments = null;
             if ((launchParams.Args != null) && (launchParams.Args.Length > 0))
             {
-                arguments = string.Join(" ", launchParams.Args);
+                var sb = new StringBuilder();
+                for (int i = 0; i < launchParams.Args.Length; i++)
+                {
+                    sb.Append(PowerShellContext.QuoteEscapeString(launchParams.Args[i]));
+                    if (i < launchParams.Args.Length - 1)
+                    {
+                        sb.Append(' ');
+                    }
+                }
+                arguments = sb.ToString();
                 Logger.Write(LogLevel.Verbose, "Script arguments are: " + arguments);
             }
 

src/PowerShellEditorServices/Session/PowerShellContext.cs

@@ -769,7 +769,8 @@ await this.ExecuteCommand<object>(
         /// <returns>A Task that can be awaited for completion.</returns>
         public async Task ExecuteScriptWithArgs(string script, string arguments = null, bool writeInputToHost = false)
         {
-            string launchedScript = script;
+            string reportedScript = script;
+            string escapedScriptPath = PowerShellContext.WildcardEscapePath(script);
             PSCommand command = new PSCommand();
 
             if (arguments != null)
@@ -797,21 +798,22 @@ public async Task ExecuteScriptWithArgs(string script, string arguments = null,
                 if (File.Exists(script) || File.Exists(scriptAbsPath))
                 {
                     // Dot-source the launched script path
-                    script = ". " + QuoteEscapeString(script);
+                    escapedScriptPath = ". " + QuoteEscapeString(escapedScriptPath);
                 }
 
-                launchedScript = script + " " + arguments;
-                command.AddScript(launchedScript, false);
+                reportedScript += " " + arguments;
+                escapedScriptPath = escapedScriptPath + " " + arguments;
+                command.AddScript(escapedScriptPath, false);
             }
             else
             {
-                command.AddCommand(script, false);
+                command.AddCommand(escapedScriptPath, false);
             }
 
             if (writeInputToHost)
             {
                 this.WriteOutput(
-                    launchedScript + Environment.NewLine,
+                    script + Environment.NewLine,
                     true);
             }
 
@@ -1183,6 +1185,7 @@ internal static string WildcardEscapePath(string path, bool escapeSpaces = false
                     case ']':
                     case '*':
                     case '?':
+                    case '`':
                         sb.Append('`').Append(curr);
                         break;