Skip to content

Fix Set-Location history with wildcard paths #27527

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
KirtiRamchandani wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix Set-Location history with wildcard paths #27527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions src/System.Management.Automation/engine/SessionStateLocationAPIs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,15 +253,15 @@ internal PathInfo SetLocation(string path, CmdletProviderContext context, bool l
throw new InvalidOperationException(SessionStateStrings.LocationUndoStackIsEmpty);
}

path = _setLocationHistory.Undo(this.CurrentLocation).Path;
path = GetEscapedLocationHistoryPath(_setLocationHistory.Undo(this.CurrentLocation));
break;
case string originalPathSwitch when !literalPath && originalPathSwitch.Equals("+", StringComparison.Ordinal):
if (_setLocationHistory.RedoCount <= 0)
{
throw new InvalidOperationException(SessionStateStrings.LocationRedoStackIsEmpty);
}

path = _setLocationHistory.Redo(this.CurrentLocation).Path;
path = GetEscapedLocationHistoryPath(_setLocationHistory.Redo(this.CurrentLocation));
break;
default:
var pushPathInfo = GetNewPushPathInfo();
Expand Down Expand Up @@ -855,6 +855,13 @@ private PathInfo GetNewPushPathInfo()
return newPushLocation;
}

private static string GetEscapedLocationHistoryPath(PathInfo location)
{
return LocationGlobber.GetMshQualifiedPath(
WildcardPattern.Escape(location.Path),
location.GetDrive());
}
Comment on lines +858 to +863

/// <summary>
/// Resets the current working drive and directory to the first
/// entry on the working directory stack and removes that entry
Expand Down
18 changes: 18 additions & 0 deletions test/powershell/Modules/Microsoft.PowerShell.Management/Set-Location.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,24 @@ Describe "Set-Location" -Tags "CI" {
(Get-Location).Path | Should -Be $initialLocation
}

It 'Should go through locations with wildcard characters when specifying minus and plus as paths' {
$testPath = Join-Path $TestDrive 'foo - bar(123-456)[foo]'
$otherPath = Join-Path $TestDrive 'other'
$null = New-Item -ItemType Directory -Path $testPath
$null = New-Item -ItemType Directory -Path $otherPath

Set-Location $TestDrive
$testDrivePath = (Get-Location).Path
Set-Location -LiteralPath $testPath
Set-Location -LiteralPath $otherPath
Set-Location -
(Get-Location).Path | Should -BeExactly $testPath
Set-Location -
(Get-Location).Path | Should -BeExactly $testDrivePath
Set-Location +
(Get-Location).Path | Should -BeExactly $testPath
Comment on lines +157 to +167
}

It 'Should go back to previous locations when specifying minus twice' {
$initialLocation = (Get-Location).Path
Set-Location ([System.IO.Path]::GetTempPath())
Expand Down