Reintroduce Keith's script execution changes

Author: daviwil

src/PowerShellEditorServices.Protocol/Server/DebugAdapter.cs

@@ -97,6 +97,9 @@ protected override void Initialize()
 
         protected Task LaunchScript(RequestContext<object> requestContext)
         {
+            // Ensure the read loop is stopped
+            this.editorSession.ConsoleService.CancelReadLoop();
+
             return editorSession.PowerShellContext
                     .ExecuteScriptWithArgs(this.scriptToLaunch, this.arguments)
                     .ContinueWith(this.OnExecutionCompleted);
@@ -138,10 +141,11 @@ private async Task OnExecutionCompleted(Task executeTask)
                     }
                 }
 
-                if (!this.ownsEditorSession)
-                {
-                    this.editorSession.ConsoleService.StartReadLoop();
-                }
+            }
+
+            if (!this.ownsEditorSession)
+            {
+                this.editorSession.ConsoleService.StartReadLoop();
             }
 
             if (this.disconnectRequestContext != null)

src/PowerShellEditorServices/Session/PowerShellContext.cs

@@ -22,6 +22,7 @@ namespace Microsoft.PowerShell.EditorServices
     using System.Management.Automation.Host;
     using System.Management.Automation.Runspaces;
     using Microsoft.PowerShell.EditorServices.Session.Capabilities;
+    using System.IO;
 
     /// <summary>
     /// Manages the lifetime and usage of a PowerShell session.
@@ -665,21 +666,48 @@ await this.ExecuteCommand<object>(
         /// <summary>
         /// Executes a script file at the specified path.
         /// </summary>
-        /// <param name="scriptPath">The path to the script file to execute.</param>
+        /// <param name="script">The script execute.</param>
         /// <param name="arguments">Arguments to pass to the script.</param>
         /// <returns>A Task that can be awaited for completion.</returns>
-        public async Task ExecuteScriptAtPath(string scriptPath, string arguments = null)
-        {
-            // If we don't escape wildcard characters in the script path, the script can
-            // fail to execute if say the script name was foo][.ps1.
-            // Related to issue #123.
-            string escapedScriptPath = EscapePath(scriptPath, escapeSpaces: true);
-
-            await this.ExecuteScriptString(
-                $"{escapedScriptPath} {arguments}",
-                true,
-                true,
-                false);
+        public async Task ExecuteScriptWithArgs(string script, string arguments = null)
+        {
+            PSCommand command = new PSCommand();
+
+            if (arguments != null)
+            {
+                // Need to determine If the script string is a path to a script file.
+                string scriptAbsPath = string.Empty;
+                try
+                {
+                    // Assume we can only debug scripts from the FileSystem provider
+                    string workingDir =
+                        this.CurrentRunspace.Runspace.SessionStateProxy.Path.CurrentFileSystemLocation.ProviderPath;
+                    workingDir = workingDir.TrimEnd(Path.DirectorySeparatorChar);
+                    scriptAbsPath = workingDir + Path.DirectorySeparatorChar + script;
+                }
+                catch (System.Management.Automation.DriveNotFoundException e)
+                {
+                    Logger.Write(
+                        LogLevel.Error,
+                        "Could not determine current filesystem location:\r\n\r\n" + e.ToString());
+                }
+
+                // If we don't escape wildcard characters in a path to a script file, the script can
+                // fail to execute if say the script filename was foo][.ps1.
+                // Related to issue #123.
+                if (File.Exists(script) || File.Exists(scriptAbsPath))
+                {
+                    script = EscapePath(script, escapeSpaces: true);
+                }
+                string scriptWithArgs = script + " " + arguments;
+                command.AddScript(scriptWithArgs);
+            }
+            else
+            {
+                command.AddCommand(script);
+            }
+
+            await this.ExecuteCommand<object>(command, true);
         }
 
         internal static TResult ExecuteScriptAndGetItem<TResult>(string scriptToExecute, Runspace runspace, TResult defaultValue = default(TResult))