address robs feedback

Author: TylerLeonhardt

src/PowerShellEditorServices.Protocol/Server/DebugAdapter.cs

@@ -494,31 +494,19 @@ protected async Task HandleSetBreakpointsRequest(
         {
             ScriptFile scriptFile = null;
 
-            // 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
-            {
-                // When you set a breakpoint in the right pane of a Git diff window on a PS1 file,
-                // the Source.Path comes through as Untitled-X.
-                if (!ScriptFile.IsUntitledPath(setBreakpointsParams.Source.Path))
-                {
-                    scriptFile = _editorSession.Workspace.GetFile(setBreakpointsParams.Source.Path);
-                }
-            }
-            catch (Exception e) when (
-                e is FileNotFoundException ||
-                e is DirectoryNotFoundException ||
-                e is IOException ||
-                e is NotSupportedException ||
-                e is PathTooLongException ||
-                e is SecurityException ||
-                e is UnauthorizedAccessException)
+            // When you set a breakpoint in the right pane of a Git diff window on a PS1 file,
+            // the Source.Path comes through as Untitled-X. That's why we check for IsUntitledPath.
+            if (!ScriptFile.IsUntitledPath(setBreakpointsParams.Source.Path) &&
+                !_editorSession.Workspace.TryGetFile(
+                    setBreakpointsParams.Source.Path,
+                    out scriptFile,
+                    out Exception exception))
             {
                 Logger.WriteException(
                     $"Failed to set breakpoint on file: {setBreakpointsParams.Source.Path}",
-                    e);
+                    exception);
 
-                string message = _noDebug ? string.Empty : "Source file could not be accessed, breakpoint not set - " + e.Message;
+                string message = _noDebug ? string.Empty : "Source file could not be accessed, breakpoint not set - " + exception.Message;
                 var srcBreakpoints = setBreakpointsParams.Breakpoints
                     .Select(srcBkpt => Protocol.DebugAdapter.Breakpoint.Create(
                         srcBkpt, setBreakpointsParams.Source.Path, message, verified: _noDebug));

src/PowerShellEditorServices/Language/LanguageService.cs

@@ -342,17 +342,7 @@ public async Task<FindReferencesResult> FindReferencesOfSymbol(
             {
                 if (!fileMap.Contains(file))
                 {
-                    ScriptFile scriptFile;
-                    try
-                    {
-                        scriptFile = workspace.GetFile(file);
-                    }
-                    catch (Exception e) when (e is IOException
-                                           || e is SecurityException
-                                           || e is FileNotFoundException
-                                           || e is DirectoryNotFoundException
-                                           || e is PathTooLongException
-                                           || e is UnauthorizedAccessException)
+                    if (!workspace.TryGetFile(file, out ScriptFile scriptFile))
                     {
                         // If we can't access the file for some reason, just ignore it
                         continue;

src/PowerShellEditorServices/Workspace/Workspace.cs

@@ -107,15 +107,34 @@ public ScriptFile GetFile(string filePath)
         /// <param name="filePath">The file path at which the script resides.</param>
         /// <param name="scriptFile">The out parameter that will contain the ScriptFile object.</param>
         public bool TryGetFile(string filePath, out ScriptFile scriptFile)
+        {
+            return TryGetFile(filePath, out scriptFile, out Exception e);
+        }
+
+        /// <summary>
+        /// Tries to get an open file in the workspace. Returns true or false if it succeeds.
+        /// </summary>
+        /// <param name="filePath">The file path at which the script resides.</param>
+        /// <param name="scriptFile">The out parameter that will contain the ScriptFile object.</param>
+        /// <param name="exception">The out parameter that will contain the underlying exception.</param>
+        public bool TryGetFile(string filePath, out ScriptFile scriptFile, out Exception exception)
         {
             try
             {
                 scriptFile = GetFile(filePath);
+                exception = null;
                 return true;
             }
-            catch (FileNotFoundException)
+            catch (Exception e) when (
+                e is IOException ||
+                e is SecurityException ||
+                e is FileNotFoundException ||
+                e is DirectoryNotFoundException ||
+                e is PathTooLongException ||
+                e is UnauthorizedAccessException)
             {
                 scriptFile = null;
+                exception = e;
                 return false;
             }
         }