Skip to content

[release/v7.4.0-preview.7]Fix UNC path completion regression #20541

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
adityapatwardhan merged 1 commit into from
Oct 19, 2023
Merged

[release/v7.4.0-preview.7]Fix UNC path completion regression #20541

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
21 changes: 9 additions & 12 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 @@ -4629,22 +4629,19 @@ private static List<CompletionResult> GetFileSystemProviderResults(
string basePath;
if (!relativePaths)
{
string providerName = $"{provider.ModuleName}\\{provider.Name}::";
if (pathInfo.Path.StartsWith(providerName, StringComparison.OrdinalIgnoreCase))
if (pathInfo.Drive is null)
{
basePath = pathInfo.Path.Substring(providerName.Length);
basePath = dirInfo.FullName;
}
else
{
providerName = $"{provider.Name}::";
if (pathInfo.Path.StartsWith(providerName, StringComparison.OrdinalIgnoreCase))
{
basePath = pathInfo.Path.Substring(providerName.Length);
}
else
{
basePath = pathInfo.Path;
}
int stringStartIndex = pathInfo.Drive.Root.EndsWith(provider.ItemSeparator) && pathInfo.Drive.Root.Length > 1
? pathInfo.Drive.Root.Length - 1
: pathInfo.Drive.Root.Length;

basePath = pathInfo.Drive.VolumeSeparatedByColon
? string.Concat(pathInfo.Drive.Name, ":", dirInfo.FullName.AsSpan(stringStartIndex))
: string.Concat(pathInfo.Drive.Name, dirInfo.FullName.AsSpan(stringStartIndex));
}

basePath = basePath.EndsWith(provider.ItemSeparator)
Expand Down
5 changes: 5 additions & 0 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 @@ -1276,6 +1276,11 @@ class InheritedClassTest : System.Attribute
}
}

It 'Should correct slashes in UNC path completion' -Skip:(!$IsWindows) {
$Res = TabExpansion2 -inputScript 'Get-ChildItem //localhost/c$/Windows'
$Res.CompletionMatches[0].CompletionText | Should -Be "'\\localhost\c$\Windows'"
}

It 'Should keep custom drive names when completing file paths' {
$TempDriveName = "asdf"
$null = New-PSDrive -Name $TempDriveName -PSProvider FileSystem -Root $HOME
Expand Down