Skip to content

Add completion for variables assigned by Data statement #19831

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
Jul 11, 2023
Merged

Add completion for variables assigned by Data statement #19831

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
fdca591
Add completion for variables assigned by Data statement
MartinGC94 Jun 20, 2023
61ba0bb
Handle data statements without variables.
MartinGC94 Jun 23, 2023
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
15 changes: 15 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 @@ -5656,6 +5656,21 @@ public override AstVisitAction VisitScriptBlockExpression(ScriptBlockExpressionA
parent = parent.Parent;
}
}

public override AstVisitAction VisitDataStatement(DataStatementAst dataStatementAst)
{
if (dataStatementAst.Extent.StartOffset >= StopSearchOffset)
{
return AstVisitAction.StopVisit;
}

if (dataStatementAst.Variable is not null)
{
SaveVariableInfo(dataStatementAst.Variable, variableType: null, isConstraint: false);
}

return AstVisitAction.SkipChildren;
}
}

private static readonly Lazy<SortedSet<string>> s_specialVariablesCache = new Lazy<SortedSet<string>>(BuildSpecialVariablesCache);
Expand Down
6 changes: 6 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 @@ -657,6 +657,12 @@ ConstructorTestClass(int i, bool b)
$res.CompletionMatches[0].CompletionText | Should -BeExactly Cat
}

It 'Should complete variable assigned with Data statement' {
$TestString = 'data MyDataVar {"Hello"};$MyDatav'
$res = TabExpansion2 -inputScript $TestString
$res.CompletionMatches[0].CompletionText | Should -BeExactly '$MyDataVar'
}

it 'Should complete "Value" parameter value in "Where-Object" for Enum property with no input' {
$res = TabExpansion2 -inputScript 'Get-Command | where-Object CommandType -eq '
$res.CompletionMatches[0].CompletionText | Should -BeExactly Alias
Expand Down