Improve completion of parameters for attributes (#14525)

MartinGC94 · web-flow · commit e26d7084e23f · 2021-01-14T09:30:15.000+05:00
diff --git a/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs b/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs
@@ -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
                         {
                             //
@@ -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)
                                         {
@@ -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;
                             }
diff --git a/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1 b/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
@@ -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 = @'
