Skip to content

Add property assignment completion for enums #19178

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
PaulHigin merged 2 commits into from
Feb 23, 2023
Merged

Add property assignment completion for enums #19178

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
7d29d39
Add property assignment completion for enums
MartinGC94 Feb 19, 2023
936fa69
Move method
MartinGC94 Feb 22, 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
24 changes: 24 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 @@ -1421,6 +1421,24 @@ private static bool TryGetTypeConstraintOnVariable(
return typeConstraint != null || setConstraint != null;
}

private static List<CompletionResult> CompletePropertyAssignment(MemberExpressionAst memberExpression, CompletionContext context)
{
if (SafeExprEvaluator.TrySafeEval(memberExpression, context.ExecutionContext, out var evalValue))
{
if (evalValue is null)
{
return null;
}

Type type = evalValue.GetType();
if (type.IsEnum)
{
return GetResultForEnum(type, context);
}
}
return null;
}

private static bool TryGetCompletionsForVariableAssignment(
CompletionContext completionContext,
AssignmentStatementAst assignmentAst,
Expand Down Expand Up @@ -1452,6 +1470,12 @@ bool TryGetResultForSet(Type typeConstraint, ValidateSetAttribute setConstraint,
return false;
}

if (assignmentAst.Left is MemberExpressionAst member)
{
completions = CompletePropertyAssignment(member, completionContext);
return completions is not null;
}

completions = null;

// Try to get the variable from the assignment, plus any type constraint on it
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 @@ -378,6 +378,11 @@ using `
$res.CompletionMatches[0].CompletionText | Should -BeExactly '${PSVersionTable}'
}

It 'Should work for property assignment of enum type:' {
$res = TabExpansion2 -inputScript '$psstyle.Progress.View="Clas'
$res.CompletionMatches[0].CompletionText | Should -Be '"Classic"'
}

It 'Should work for variable assignment of enum type: <inputStr>' -TestCases @(
@{ inputStr = '$ErrorActionPreference = '; filter = ''; doubleQuotes = $false }
@{ inputStr = '$ErrorActionPreference='; filter = ''; doubleQuotes = $false }
Expand Down