Merge pull request #210 from rkeithhill/rkeithhill/is194-ctrl-f5-run

Rkeithhill/is194 ctrl f5 run

Author: rkeithhill

src/PowerShellEditorServices.Protocol/DebugAdapter/LaunchRequest.cs

@@ -22,6 +22,12 @@ public class LaunchRequestArguments
         /// </summary>
         public string Program { get; set; }
 
+        /// <summary>
+        /// Gets or sets a boolean value that indicates whether the script should be
+        /// run with (false) or without (true) debugging support.
+        /// </summary>
+        public bool NoDebug { get; set; }
+
         /// <summary>
         /// Gets or sets a boolean value that determines whether to automatically stop 
         /// target after launch. If not specified, target does not stop.

src/PowerShellEditorServices.Protocol/Server/DebugAdapter.cs

@@ -23,6 +23,7 @@ public class DebugAdapter : DebugAdapterBase
         private OutputDebouncer outputDebouncer;
         private bool isConfigurationDoneRequestComplete;
         private bool isLaunchRequestComplete;
+        private bool noDebug;
         private string scriptPathToLaunch;
         private string arguments;
 
@@ -158,6 +159,7 @@ protected async Task HandleLaunchRequest(
             // If the launch request comes first, then stash the launch
             // params so that the subsequent configurationDone request handler 
             // can launch the script. 
+            this.noDebug = launchParams.NoDebug;
             this.scriptPathToLaunch = launchParams.Program;
             this.arguments = arguments;
 
@@ -225,9 +227,11 @@ protected async Task HandleSetBreakpointsRequest(
                     LogLevel.Warning, 
                     $"Attempted to set breakpoints on a non-existing file: {setBreakpointsParams.Source.Path}");
 
+                string message = this.noDebug ? string.Empty : "Source does not exist, breakpoint not set.";
+
                 var srcBreakpoints = setBreakpointsParams.Breakpoints
                     .Select(srcBkpt => Protocol.DebugAdapter.Breakpoint.Create(
-                        srcBkpt, setBreakpointsParams.Source.Path, "Source does not exist, breakpoint not set."));
+                        srcBkpt, setBreakpointsParams.Source.Path, message, verified: this.noDebug));
 
                 // Return non-verified breakpoint message.
                 await requestContext.SendResult(
@@ -249,16 +253,20 @@ await requestContext.SendResult(
                     srcBreakpoint.Condition);
             }
 
-            BreakpointDetails[] breakpoints =
-                await editorSession.DebugService.SetLineBreakpoints(
-                    scriptFile,
-                    breakpointDetails);
+            // If this is a "run without debugging (Ctrl+F5)" session ignore requests to set breakpoints.
+            BreakpointDetails[] updatedBreakpointDetails = breakpointDetails;
+            if (!this.noDebug)
+            {
+                updatedBreakpointDetails =
+                    await editorSession.DebugService.SetLineBreakpoints(
+                        scriptFile,
+                        breakpointDetails);
+            }
 
             await requestContext.SendResult(
-                new SetBreakpointsResponseBody
-                {
+                new SetBreakpointsResponseBody {
                     Breakpoints =
-                        breakpoints
+                        updatedBreakpointDetails
                             .Select(Protocol.DebugAdapter.Breakpoint.Create)
                             .ToArray()
                 });
@@ -277,14 +285,19 @@ protected async Task HandleSetFunctionBreakpointsRequest(
                     funcBreakpoint.Condition);
             }
 
-            CommandBreakpointDetails[] breakpoints =
-                await editorSession.DebugService.SetCommandBreakpoints(
-                    breakpointDetails);
+            // If this is a "run without debugging (Ctrl+F5)" session ignore requests to set breakpoints.
+            CommandBreakpointDetails[] updatedBreakpointDetails = breakpointDetails;
+            if (!this.noDebug)
+            {
+                updatedBreakpointDetails =
+                    await editorSession.DebugService.SetCommandBreakpoints(
+                        breakpointDetails);
+            }
 
             await requestContext.SendResult(
                 new SetBreakpointsResponseBody {
                     Breakpoints =
-                        breakpoints
+                        updatedBreakpointDetails
                             .Select(Protocol.DebugAdapter.Breakpoint.Create)
                             .ToArray()
                 });

src/PowerShellEditorServices/Debugging/BreakpointDetails.cs

@@ -53,6 +53,7 @@ public static BreakpointDetails Create(
 
             return new BreakpointDetails
             {
+                Verified = true,
                 Source = source,
                 LineNumber = line,
                 ColumnNumber = column,

src/PowerShellEditorServices/Debugging/DebugService.cs

@@ -86,7 +86,7 @@ public async Task<BreakpointDetails[]> SetLineBreakpoints(
                 foreach (BreakpointDetails breakpoint in breakpoints)
                 {
                     PSCommand psCommand = new PSCommand();
-                    psCommand.AddCommand("Set-PSBreakpoint");
+                    psCommand.AddCommand(@"Microsoft.PowerShell.Utility\Set-PSBreakpoint");
                     psCommand.AddParameter("Script", escapedScriptPath);
                     psCommand.AddParameter("Line", breakpoint.LineNumber);