WIP

Author: rkeithhill

src/PowerShellEditorServices/Debugging/DebugService.cs

@@ -79,7 +79,8 @@ public async Task<BreakpointDetails[]> SetBreakpoints(
             {
                 // Fix for issue #123 - file paths that contain wildcard chars [ and ] need to
                 // quoted and have those wildcard chars escaped.
-                string escapedScriptPath = PowerShellContext.EscapeWildcardsInPath(scriptFile.FilePath);
+                string escapedScriptPath = 
+                    PowerShellContext.EscapePath(scriptFile.FilePath, escapeSpaces: false);
 
                 PSCommand psCommand = new PSCommand();
                 psCommand.AddCommand("Set-PSBreakpoint");

src/PowerShellEditorServices/Session/PowerShellContext.cs

@@ -457,7 +457,7 @@ 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 = EscapeWildcardsInPath(scriptPath);
+            string escapedScriptPath = EscapePath(scriptPath, escapeSpaces: true);
 
             if (arguments != null)
             {
@@ -577,13 +577,21 @@ internal void ReleaseRunspaceHandle(RunspaceHandle runspaceHandle)
         }
 
         /// <summary>
-        /// Returns the passed in path with the [ and ] wildcard characters escaped.
+        /// Returns the passed in path with the [ and ] characters escaped. Escaping spaces is optional.
         /// </summary>
         /// <param name="path">The path to process.</param>
+        /// <param name="escapeSpaces">Specify True to escape spaces in the path, otherwise False.</param>
         /// <returns>The path with [ and ] escaped.</returns>
-        internal static string EscapeWildcardsInPath(string path)
+        internal static string EscapePath(string path, bool escapeSpaces)
         {
-            return path.Replace("[", "`[").Replace("]", "`]");
+            string escapedPath = path.Replace("[", "`[").Replace("]", "`]");
+
+            if (escapeSpaces)
+            {
+                escapedPath = escapedPath.Replace(" ", "` ");
+            }
+
+            return escapedPath;
         }
 
         #endregion

test/PowerShellEditorServices.Test.Shared/PowerShellEditorServices.Test.Shared.csproj

@@ -64,7 +64,7 @@
     <None Include="Completion\CompletionExamples.psm1">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Debugging\DebugWithParamsTest.ps1" />
+    <None Include="Debugging\Debug With Params [Test].ps1" />
     <None Include="Debugging\VariableTest.ps1" />
     <None Include="SymbolDetails\SymbolDetails.ps1" />
     <None Include="Symbols\MultipleSymbols.ps1" />

test/PowerShellEditorServices.Test/Debugging/DebugServiceTests.cs

@@ -89,7 +89,7 @@ public async Task DebuggerAcceptsScriptArgs(string[] args)
         {
             ScriptFile debugWithParamsFile =
                 this.workspace.GetFile(
-                    @"..\..\..\PowerShellEditorServices.Test.Shared\Debugging\DebugWithParamsTest.ps1");
+                    @"..\..\..\PowerShellEditorServices.Test.Shared\Debugging\Debug With Params [Test].ps1");
 
             await this.debugService.SetBreakpoints(
                 debugWithParamsFile,