Merge branch 'master' into rkeithhill/is196-dbgr-fails-to-start

Author: rkeithhill

src/PowerShellEditorServices.Protocol/DebugAdapter/Breakpoint.cs

@@ -3,6 +3,8 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
+using Microsoft.PowerShell.EditorServices.Utility;
+
 namespace Microsoft.PowerShell.EditorServices.Protocol.DebugAdapter
 {
     public class Breakpoint
@@ -32,6 +34,8 @@ private Breakpoint()
         public static Breakpoint Create(
             BreakpointDetails breakpointDetails)
         {
+            Validate.IsNotNull(nameof(breakpointDetails), breakpointDetails);
+
             return new Breakpoint
             {
                 Verified = breakpointDetails.Verified,
@@ -45,10 +49,31 @@ public static Breakpoint Create(
         public static Breakpoint Create(
             CommandBreakpointDetails breakpointDetails)
         {
+            Validate.IsNotNull(nameof(breakpointDetails), breakpointDetails);
+
             return new Breakpoint {
                 Verified = breakpointDetails.Verified,
                 Message = breakpointDetails.Message
             };
         }
+
+        public static Breakpoint Create(
+            SourceBreakpoint sourceBreakpoint,
+            string source,
+            string message,
+            bool verified = false)
+        {
+            Validate.IsNotNull(nameof(sourceBreakpoint), sourceBreakpoint);
+            Validate.IsNotNull(nameof(source), source);
+            Validate.IsNotNull(nameof(message), message);
+
+            return new Breakpoint {
+                Verified = verified,
+                Message = message,
+                Source = source,
+                Line = sourceBreakpoint.Line,
+                Column = sourceBreakpoint.Column
+            };
+        }
     }
 }

src/PowerShellEditorServices.Protocol/Server/DebugAdapter.cs

@@ -211,9 +211,32 @@ protected async Task HandleSetBreakpointsRequest(
             SetBreakpointsRequestArguments setBreakpointsParams,
             RequestContext<SetBreakpointsResponseBody> requestContext)
         {
-            ScriptFile scriptFile =
-                editorSession.Workspace.GetFile(
-                    setBreakpointsParams.Source.Path);
+            ScriptFile scriptFile;
+
+            // Fix for issue #195 - user can change name of file outside of VSCode in which case
+            // VSCode sends breakpoint requests with the original filename that doesn't exist anymore.
+            try
+            {
+                scriptFile = editorSession.Workspace.GetFile(setBreakpointsParams.Source.Path);
+            }
+            catch (FileNotFoundException)
+            {
+                Logger.Write(
+                    LogLevel.Warning, 
+                    $"Attempted to set breakpoints on a non-existing file: {setBreakpointsParams.Source.Path}");
+
+                var srcBreakpoints = setBreakpointsParams.Breakpoints
+                    .Select(srcBkpt => Protocol.DebugAdapter.Breakpoint.Create(
+                        srcBkpt, setBreakpointsParams.Source.Path, "Source does not exist, breakpoint not set."));
+
+                // Return non-verified breakpoint message.
+                await requestContext.SendResult(
+                    new SetBreakpointsResponseBody {
+                        Breakpoints = srcBreakpoints.ToArray()
+                    });
+
+	            return;
+	        }
 
             var breakpointDetails = new BreakpointDetails[setBreakpointsParams.Breakpoints.Length];
             for (int i = 0; i < breakpointDetails.Length; i++)