Skip to content

Fixing #3624 - Readline crash with @{<tab> #3626

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 2 commits into from
Apr 25, 2017
Merged

Fixing #3624 - Readline crash with @{<tab> #3626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9e044c
Fixing #3624 - Readline crash with @{<tab>
Apr 22, 2017
5531daa
improving comments and test description
Apr 25, 2017
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
6 changes: 6 additions & 0 deletions src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,6 +442,12 @@ internal List<CompletionResult> GetResultHelper(CompletionContext completionCont
result = GetResultForEnumPropertyValueOfDSCResource(completionContext, string.Empty, ref replacementIndex, ref replacementLength, out unused);
}
break;
case TokenKind.AtCurly:
// Handle scenarios such as 'Sort-Object @{<tab>' and 'gci | Format-Table @{'
result = GetResultForHashtable(completionContext);
replacementIndex += 2;
replacementLength = 0;
break;

case TokenKind.Number:
// Handle scenarios such as Get-Process -Id 5<tab> || Get-Process -Id 5210, 3<tab> || Get-Process -Id: 5210, 3<tab>
Expand Down
9 changes: 9 additions & 0 deletions test/powershell/Host/TabCompletion/BugFix.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,13 @@ Describe "Tab completion bug fix" -Tags "CI" {
$result.CompletionMatches[1].CompletionText | Should Be $DatetimeProperties[1].Name # DateTime
}
}

It "Issue#3628 - 'Sort-Object @{<tab>' should work" {
$cmd = "Get-Date | Sort-Object @{"
$result = TabExpansion2 -inputScript $cmd -cursorColumn $cmd.Length
$result.CompletionMatches.Count | Should Be 3
$result.CompletionMatches[0].CompletionText | Should Be 'Expression'
$result.CompletionMatches[1].CompletionText | Should Be 'Ascending'
$result.CompletionMatches[2].CompletionText | Should Be 'Descending'
}
}