Skip to content

Fix issue when completing the first command in a script with an empty array expression #18355

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
Nov 8, 2022
+9 −1
Merged

Fix issue when completing the first command in a script with an empty array expression #18355

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
958a868
Fix issue when completing the first command in a script with an empty…
MartinGC94 Oct 22, 2022
a1ebad1
Update src/System.Management.Automation/engine/CommandCompletion/Comp…
MartinGC94 Nov 8, 2022
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
5 changes: 4 additions & 1 deletion 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 @@ -2036,7 +2036,10 @@ private static List<CompletionResult> GetResultForIdentifier(CompletionContext c
// Handle completion for a path with variable, such as: $PSHOME\ty<tab>
if (completionContext.RelatedAsts.Count > 0 && completionContext.RelatedAsts[0] is ScriptBlockAst)
{
Ast cursorAst = completionContext.RelatedAsts[0].FindAll(ast => ast.Extent.EndOffset <= tokenAtCursor.Extent.StartOffset, true).LastOrDefault();
Ast cursorAst = completionContext.RelatedAsts[0].FindAll(
ast => ast.Extent.EndOffset <= tokenAtCursor.Extent.StartOffset
&& ast.Extent is not EmptyScriptExtent,
searchNestedScriptBlocks: true).LastOrDefault();

if (cursorAst is not null)
{
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 @@ -818,6 +818,11 @@ Verb-Noun -Param1 Hello ^
$res.CompletionMatches[0].CompletionText | Should -Be "Break"
}

it 'Should complete command with an empty arrayexpression element' {
$res = TabExpansion2 -inputScript 'Get-ChildItem @()' -cursorColumn 1
$res.CompletionMatches[0].CompletionText | Should -Be "Get-ChildItem"
}

Context "Script name completion" {
BeforeAll {
Setup -f 'install-powershell.ps1' -Content ""
Expand Down