Skip to content

Commit 2d6a37c

Browse files
author
Robert Holt
committed
Change use of glob to wildcard
1 parent e07b5cd commit 2d6a37c

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/PowerShellEditorServices/Session/PowerShellContext.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1114,7 +1114,7 @@ public async Task SetWorkingDirectory(string path, bool isPathAlreadyEscaped)
11141114
{
11151115
if (!isPathAlreadyEscaped)
11161116
{
1117-
path = GlobEscapePath(path);
1117+
path = WildcardEscapePath(path);
11181118
}
11191119

11201120
runspaceHandle.Runspace.SessionStateProxy.Path.SetLocation(path);
@@ -1129,7 +1129,7 @@ public async Task SetWorkingDirectory(string path, bool isPathAlreadyEscaped)
11291129
/// <returns>An escaped version of the path that can be embedded in PowerShell script.</returns>
11301130
internal static string FullyPowerShellEscapePath(string path)
11311131
{
1132-
string globEscapedPath = GlobEscapePath(path);
1132+
string globEscapedPath = WildcardEscapePath(path);
11331133
return QuoteEscapeString(globEscapedPath);
11341134
}
11351135

@@ -1170,7 +1170,7 @@ internal static string QuoteEscapeString(string escapedPath)
11701170
/// <param name="path">The path to process.</param>
11711171
/// <param name="escapeSpaces">Specify True to escape spaces in the path, otherwise False.</param>
11721172
/// <returns>The path with [ and ] escaped.</returns>
1173-
internal static string GlobEscapePath(string path, bool escapeSpaces = false)
1173+
internal static string WildcardEscapePath(string path, bool escapeSpaces = false)
11741174
{
11751175
var sb = new StringBuilder();
11761176
for (int i = 0; i < path.Length; i++)
@@ -1211,10 +1211,10 @@ internal static string GlobEscapePath(string path, bool escapeSpaces = false)
12111211
[Obsolete("This API is not meant for public usage and should not be used.")]
12121212
public static string EscapePath(string path, bool escapeSpaces)
12131213
{
1214-
return GlobEscapePath(path, escapeSpaces);
1214+
return WildcardEscapePath(path, escapeSpaces);
12151215
}
12161216

1217-
internal static string UnescapeGlobEscapedPath(string globEscapedPath)
1217+
internal static string UnescapeWildcardEscapedPath(string globEscapedPath)
12181218
{
12191219
// Prevent relying on my implementation if we can help it
12201220
if (!globEscapedPath.Contains('`'))
@@ -1264,7 +1264,7 @@ internal static string UnescapeGlobEscapedPath(string globEscapedPath)
12641264
[Obsolete("This API is not meant for public usage and should not be used.")]
12651265
public static string UnescapePath(string path)
12661266
{
1267-
return UnescapeGlobEscapedPath(path);
1267+
return UnescapeWildcardEscapedPath(path);
12681268
}
12691269

12701270
#endregion

0 commit comments

Comments
 (0)