Fix remaining uses of glob to wildcard

Author: Robert Holt

src/PowerShellEditorServices.Protocol/Server/DebugAdapter.cs

@@ -259,7 +259,7 @@ protected async Task HandleLaunchRequest(
                 // the path exists and is a directory.
                 if (!string.IsNullOrEmpty(workingDir))
                 {
-                    workingDir = PowerShellContext.UnescapeGlobEscapedPath(workingDir);
+                    workingDir = PowerShellContext.UnescapeWildcardEscapedPath(workingDir);
                     try
                     {
                         if ((File.GetAttributes(workingDir) & FileAttributes.Directory) != FileAttributes.Directory)

src/PowerShellEditorServices/Debugging/DebugService.cs

@@ -178,7 +178,7 @@ public async Task<BreakpointDetails[]> SetLineBreakpoints(
             // Fix for issue #123 - file paths that contain wildcard chars [ and ] need to
             // quoted and have those wildcard chars escaped.
             string escapedScriptPath =
-                PowerShellContext.GlobEscapePath(scriptPath);
+                PowerShellContext.WildcardEscapePath(scriptPath);
 
             if (dscBreakpoints == null || !dscBreakpoints.IsDscResourcePath(escapedScriptPath))
             {

src/PowerShellEditorServices/Session/PowerShellContext.cs

@@ -1129,8 +1129,8 @@ public async Task SetWorkingDirectory(string path, bool isPathAlreadyEscaped)
         /// <returns>An escaped version of the path that can be embedded in PowerShell script.</returns>
         internal static string FullyPowerShellEscapePath(string path)
         {
-            string globEscapedPath = WildcardEscapePath(path);
-            return QuoteEscapeString(globEscapedPath);
+            string wildcardEscapedPath = WildcardEscapePath(path);
+            return QuoteEscapeString(wildcardEscapedPath);
         }
 
         /// <summary>
@@ -1214,23 +1214,23 @@ public static string EscapePath(string path, bool escapeSpaces)
             return WildcardEscapePath(path, escapeSpaces);
         }
 
-        internal static string UnescapeWildcardEscapedPath(string globEscapedPath)
+        internal static string UnescapeWildcardEscapedPath(string wildcardEscapedPath)
         {
             // Prevent relying on my implementation if we can help it
-            if (!globEscapedPath.Contains('`'))
+            if (!wildcardEscapedPath.Contains('`'))
             {
-                return globEscapedPath;
+                return wildcardEscapedPath;
             }
 
-            var sb = new StringBuilder(globEscapedPath.Length);
-            for (int i = 0; i < globEscapedPath.Length; i++)
+            var sb = new StringBuilder(wildcardEscapedPath.Length);
+            for (int i = 0; i < wildcardEscapedPath.Length; i++)
             {
                 // If we see a backtick perform a lookahead
-                char curr = globEscapedPath[i];
-                if (curr == '`' && i + 1 < globEscapedPath.Length)
+                char curr = wildcardEscapedPath[i];
+                if (curr == '`' && i + 1 < wildcardEscapedPath.Length)
                 {
                     // If the next char is an escapable one, don't add this backtick to the new string
-                    char next = globEscapedPath[i + 1];
+                    char next = wildcardEscapedPath[i + 1];
                     switch (next)
                     {
                         case '[':

src/PowerShellEditorServices/Workspace/Workspace.cs

@@ -373,7 +373,7 @@ internal string ResolveFilePath(string filePath)
                 // Clients could specify paths with escaped space, [ and ] characters which .NET APIs
                 // will not handle.  These paths will get appropriately escaped just before being passed
                 // into the PowerShell engine.
-                filePath = PowerShellContext.UnescapeGlobEscapedPath(filePath);
+                filePath = PowerShellContext.UnescapeWildcardEscapedPath(filePath);
 
                 // Get the absolute file path
                 filePath = Path.GetFullPath(filePath);

test/PowerShellEditorServices.Test/Session/PathEscapingTests.cs

@@ -23,9 +23,9 @@ public class PathEscapingTests
         [InlineData("/CJK.chars/脚本/[hello].ps1", "/CJK.chars/脚本/`[hello`].ps1")]
         [InlineData("C:\\Animals\\утка\\quack.ps1", "C:\\Animals\\утка\\quack.ps1")]
         [InlineData("C:\\&nimals\\утка\\qu*ck?.ps1", "C:\\&nimals\\утка\\qu`*ck`?.ps1")]
-        public void CorrectlyGlobEscapesPaths_NoSpaces(string unescapedPath, string escapedPath)
+        public void CorrectlyWildcardEscapesPaths_NoSpaces(string unescapedPath, string escapedPath)
         {
-            string extensionEscapedPath = PowerShellContext.GlobEscapePath(unescapedPath);
+            string extensionEscapedPath = PowerShellContext.WildcardEscapePath(unescapedPath);
             Assert.Equal(escapedPath, extensionEscapedPath);
         }
 
@@ -43,9 +43,9 @@ public void CorrectlyGlobEscapesPaths_NoSpaces(string unescapedPath, string esca
         [InlineData("/CJK chars/脚本/[hello].ps1", "/CJK` chars/脚本/`[hello`].ps1")]
         [InlineData("C:\\Animal s\\утка\\quack.ps1", "C:\\Animal` s\\утка\\quack.ps1")]
         [InlineData("C:\\&nimals\\утка\\qu*ck?.ps1", "C:\\&nimals\\утка\\qu`*ck`?.ps1")]
-        public void CorrectlyGlobEscapesPaths_Spaces(string unescapedPath, string escapedPath)
+        public void CorrectlyWildcardEscapesPaths_Spaces(string unescapedPath, string escapedPath)
         {
-            string extensionEscapedPath = PowerShellContext.GlobEscapePath(unescapedPath, escapeSpaces: true);
+            string extensionEscapedPath = PowerShellContext.WildcardEscapePath(unescapedPath, escapeSpaces: true);
             Assert.Equal(escapedPath, extensionEscapedPath);
         }
 
@@ -107,7 +107,7 @@ public void CorrectlyFullyEscapesPaths(string unescapedPath, string escapedPath)
         [InlineData("C:\\&nimals\\утка\\qu`*ck`?.ps1", "C:\\&nimals\\утка\\qu*ck?.ps1")]
         public void CorrectlyUnescapesPaths(string escapedPath, string expectedUnescapedPath)
         {
-            string extensionUnescapedPath = PowerShellContext.UnescapeGlobEscapedPath(escapedPath);
+            string extensionUnescapedPath = PowerShellContext.UnescapeWildcardEscapedPath(escapedPath);
             Assert.Equal(expectedUnescapedPath, extensionUnescapedPath);
         }