Skip to content

Improve completion of parameters for attributes #14525

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
iSazonov merged 3 commits into from
Jan 14, 2021
Merged

Improve completion of parameters for attributes #14525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2321324
Fix attribute parameter completion with more than 1 parameter
MartinGC94 Dec 31, 2020
e69edc6
Add test for multiple attribute parameters.
MartinGC94 Dec 31, 2020
328ba08
Update src/System.Management.Automation/engine/CommandCompletion/Comp…
iSazonov Jan 14, 2021
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
28 changes: 14 additions & 14 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 @@ -526,6 +526,12 @@ internal List<CompletionResult> GetResultHelper(CompletionContext completionCont

result = CompletionCompleters.CompleteCommandArgument(completionContext);
}
else if (lastAst is AttributeAst)
{
completionContext.ReplacementIndex = replacementIndex += tokenAtCursor.Text.Length;
completionContext.ReplacementLength = replacementLength = 0;
result = GetResultForAttributeArgument(completionContext, ref replacementIndex, ref replacementLength);
}
else
{
//
Expand Down Expand Up @@ -820,6 +826,7 @@ internal List<CompletionResult> GetResultHelper(CompletionContext completionCont
case TokenKind.Equals:
case TokenKind.Comma:
case TokenKind.AtParen:
case TokenKind.LParen:
{
if (lastAst is AssignmentStatementAst assignmentAst)
{
Expand All @@ -829,25 +836,18 @@ internal List<CompletionResult> GetResultHelper(CompletionContext completionCont
break;
}
}

if (lastAst is AttributeAst)
{
completionContext.ReplacementLength = replacementLength = 0;
result = GetResultForAttributeArgument(completionContext, ref replacementIndex, ref replacementLength);
break;
}

bool unused;
result = GetResultForEnumPropertyValueOfDSCResource(completionContext, string.Empty, ref replacementIndex, ref replacementLength, out unused);
break;
}
case TokenKind.LParen:
if (lastAst is AttributeAst)
{
completionContext.ReplacementLength = replacementLength = 0;
result = GetResultForAttributeArgument(completionContext, ref replacementIndex, ref replacementLength);
}
else
{
bool unused;
result = GetResultForEnumPropertyValueOfDSCResource(completionContext, string.Empty,
ref replacementIndex, ref replacementLength, out unused);
}

break;
default:
break;
}
Expand Down
7 changes: 7 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 @@ -915,6 +915,13 @@ Describe "TabCompletion" -Tags CI {
$entry = $res.CompletionMatches | Where-Object CompletionText -EQ "Position"
$entry.CompletionText | Should -BeExactly "Position"
}
It "Test Attribute member completion multiple members" {
$inputStr = "function bar { [parameter(Position,]param() }"
$res = TabExpansion2 -inputScript $inputStr -cursorColumn ($inputStr.IndexOf(',') + 1)
$res.CompletionMatches | Should -HaveCount 10
$entry = $res.CompletionMatches | Where-Object CompletionText -EQ "Mandatory"
$entry.CompletionText | Should -BeExactly "Mandatory"
}

It "Test completion with line continuation" {
$inputStr = @'
Expand Down