Skip to content

Fix completion of foreach variable #19814

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
Jun 19, 2023
Merged

Fix completion of foreach variable #19814

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: 11 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 @@ -5592,6 +5592,17 @@ public override AstVisitAction VisitParameter(ParameterAst parameterAst)
return AstVisitAction.Continue;
}

public override AstVisitAction VisitForEachStatement(ForEachStatementAst forEachStatementAst)
{
if (forEachStatementAst.Extent.StartOffset > StopSearchOffset || forEachStatementAst.Variable == CompletionVariableAst)
{
return AstVisitAction.StopVisit;
}

SaveVariableInfo(forEachStatementAst.Variable.VariablePath.UserPath, variableType: null, isConstraint: false);
return AstVisitAction.Continue;
}

public override AstVisitAction VisitAttribute(AttributeAst attributeAst)
{
// Attributes can't assign values to variables so they aren't interesting.
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 @@ -74,6 +74,11 @@ Describe "TabCompletion" -Tags CI {
$res.CompletionMatches[0].CompletionText | Should -BeExactly 'pscustomobject'
}

It 'Should complete foreach variable' {
$res = TabExpansion2 -inputScript 'foreach ($CurrentItem in 1..10){$CurrentIt'
$res.CompletionMatches[0].CompletionText | Should -BeExactly '$CurrentItem'
}

foreach ($Operator in [System.Management.Automation.CompletionCompleters]::CompleteOperator(""))
{
It "Should complete $($Operator.CompletionText)" {
Expand Down