Skip to content

Expand ~ to $home on Windows with tab completion #21529

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

Merged
daxian-dbw merged 1 commit into from
Apr 24, 2024
Merged

Expand ~ to $home on Windows with tab completion #21529

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
3 changes: 3 additions & 0 deletions src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4925,12 +4925,15 @@ private static string RebuildPathWithVars(

for (int i = 0; i < path.Length; i++)
{
// on Windows, we need to preserve the expanded home path as native commands don't understand it
#if UNIX
if (i == homeIndex)
{
_ = sb.Append('~');
i += homePath.Length - 1;
continue;
}
#endif

EscapeCharIfNeeded(sb, path, i, stringType, literalPath, useSingleQuoteEscapeRules, ref quotesAreNeeded);
_ = sb.Append(path[i]);
Expand Down
8 changes: 6 additions & 2 deletions test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1409,12 +1409,16 @@ class InheritedClassTest : System.Attribute
$res.CompletionMatches[0].CompletionText | Should -Be "`"$expectedPath`""
}

It "Should keep '~' in completiontext when it's used to refer to home in input" {
It "Should handle '~' in completiontext when it's used to refer to home in input" {
$res = TabExpansion2 -inputScript "~$separator"
# select the first answer which does not have a space in the completion (those completions look like & '3D Objects')
$observedResult = $res.CompletionMatches.Where({$_.CompletionText.IndexOf("&") -eq -1})[0].CompletionText
$completedText = $res.CompletionMatches.CompletionText -join ","
$observedResult | Should -BeLike "~$separator*" -Because "$completedText"
if ($IsWindows) {
$observedResult | Should -BeLike "$home$separator*" -Because "$completedText"
} else {
$observedResult | Should -BeLike "~$separator*" -Because "$completedText"
}
}

It "Should use '~' as relative filter text when not followed by separator" {
Expand Down