Merge pull request #139 from rkeithhill/rkeithhill/is137-dbg-working-dir

Fixes #137 - working dir should be set to something reasonable.

Author: daviwil

src/PowerShellEditorServices.Protocol/DebugAdapter/LaunchRequest.cs

@@ -24,19 +24,19 @@ public class LaunchRequestArguments
         public bool StopOnEntry { get; set; }
 
     //        /** Optional arguments passed to the debuggee. */
-        public string[] Arguments { get; set; }
+        public string[] Args { get; set; }
 
     //        /** Launch the debuggee in this working directory (specified as an absolute path). If omitted the debuggee is lauched in its own directory. */
-        public string WorkingDirectory { get; set; }
+        public string Cwd { get; set; }
 
     //        /** Absolute path to the runtime executable to be used. Default is the runtime executable on the PATH. */
         public string RuntimeExecutable { get; set; }
 
     //        /** Optional arguments passed to the runtime executable. */
-        public string[] RuntimeArguments { get; set; }
+        public string[] RuntimeArgs { get; set; }
 
     //        /** Optional environment variables to pass to the debuggee. The string valued properties of the 'environmentVariables' are used as key/value pairs. */
-        public Dictionary<string, string> EnvironmentVariables { get; set; }
+        public Dictionary<string, string> Env { get; set; }
     }
 }
 

src/PowerShellEditorServices.Protocol/Server/DebugAdapter.cs

@@ -6,10 +6,10 @@
 using Microsoft.PowerShell.EditorServices.Protocol.DebugAdapter;
 using Microsoft.PowerShell.EditorServices.Protocol.MessageProtocol;
 using Microsoft.PowerShell.EditorServices.Protocol.MessageProtocol.Channel;
-using Microsoft.PowerShell.EditorServices.Protocol.Server;
 using Microsoft.PowerShell.EditorServices.Utility;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Management.Automation;
 using System.Threading.Tasks;
@@ -74,15 +74,26 @@ protected async Task HandleLaunchRequest(
             LaunchRequestArguments launchParams,
             RequestContext<object> requestContext)
         {
+            // Set the working directory for the PowerShell runspace to something reasonable
+            // such as the cwd passed in via launch.json. And in case that is null, use the
+            // folder or the script to be executed.
+            string workingDir = launchParams.Cwd ?? Path.GetDirectoryName(launchParams.Program);
+            var setWorkingDirCommand = new PSCommand();
+            setWorkingDirCommand.AddCommand(@"Microsoft.PowerShell.Management\Set-Location")
+                .AddParameter("LiteralPath", workingDir);
+
+            await editorSession.PowerShellContext.ExecuteCommand(setWorkingDirCommand);
+
+            Logger.Write(LogLevel.Verbose, "Working dir set to '" + workingDir + "'");
+
             // Execute the given PowerShell script and send the response.
             // Note that we aren't waiting for execution to complete here
             // because the debugger could stop while the script executes.
             Task executeTask =
                 editorSession.PowerShellContext
                     .ExecuteScriptAtPath(launchParams.Program)
                     .ContinueWith(
-                        async (t) =>
-                        {
+                        async (t) => {
                             Logger.Write(LogLevel.Verbose, "Execution completed, terminating...");
 
                             await requestContext.SendEvent(