Fix tab completion of native parameters (#2919)

AndrewGaspar · lzybkr · commit ca5fc9c5a8f2 · 2017-02-13T16:02:56.000-08:00
Native argument completers were not invoked when the argument was a single dash.

The fix is to treat unbound command parameters as command arguments for the purposes of parameter/argument completion.
diff --git a/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs b/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
@@ -566,10 +566,11 @@ internal static List<CompletionResult> CompleteCommandParameter(CompletionContex
 
             PseudoBindingInfo pseudoBinding = new PseudoParameterBinder()
                                                 .DoPseudoParameterBinding(commandAst, null, parameterAst, PseudoParameterBinder.BindingType.ParameterCompletion);
-            // The command cannot be found or it's not a cmdlet, not a script cmdlet, not a function
+            // The command cannot be found or it's not a cmdlet, not a script cmdlet, not a function.
+            // Try completing as if it the parameter is a command argument for native command completion.
             if (pseudoBinding == null)
             {
-                return result;
+                return CompleteCommandArgument(context);
             }
 
             switch (pseudoBinding.InfoType)
diff --git a/test/powershell/Language/Parser/ExtensibleCompletion.Tests.ps1 b/test/powershell/Language/Parser/ExtensibleCompletion.Tests.ps1
@@ -229,6 +229,38 @@ Describe "Test extensible completion of native commands" -Tags "CI" {
     } | Get-CompletionTestCaseData | Test-Completions
 }
 
+Describe "Test completion of parameters for native commands" -Tags "CI" {
+    Register-ArgumentCompleter -Native -CommandName foo -ScriptBlock {
+        Param($wordToComplete)
+
+        @("-dir", "-verbose", "-help", "-version") |
+        Where-Object {
+            $_ -match "$wordToComplete*"
+        } |
+        ForEach-Object {
+            [CompletionResult]::new($_, $_, [CompletionResultType]::ParameterName, $_)
+        }
+    }
+
+    @{
+        ExpectedResults = @(
+            @{CompletionText = "-version"; ResultType = "ParameterName"}
+            @{CompletionText = "-verbose"; ResultType = "ParameterName"}
+            @{CompletionText = "-dir"; ResultType = "ParameterName"}
+            @{CompletionText = "-help"; ResultType = "ParameterName"}
+        )
+        TestInput = 'foo -'
+    } | Get-CompletionTestCaseData | Test-Completions
+
+    @{
+        ExpectedResults = @(
+            @{CompletionText = "-version"; ResultType = "ParameterName"}
+            @{CompletionText = "-verbose"; ResultType = "ParameterName"}
+        )
+        TestInput = 'foo -v'
+    } | Get-CompletionTestCaseData | Test-Completions
+}
+
 Describe "Test extensible completion of using namespace" -Tags "CI" {
     @{
         ExpectedResults = @(

Original file line number	Diff line number	Diff line change
`@@ -566,10 +566,11 @@ internal static List<CompletionResult> CompleteCommandParameter(CompletionContex`
`566`	`566`
`567`	`567`	`PseudoBindingInfo pseudoBinding = new PseudoParameterBinder()`
`568`	`568`	`.DoPseudoParameterBinding(commandAst, null, parameterAst, PseudoParameterBinder.BindingType.ParameterCompletion);`
`569`		`- // The command cannot be found or it's not a cmdlet, not a script cmdlet, not a function`
	`569`	`+ // The command cannot be found or it's not a cmdlet, not a script cmdlet, not a function.`
	`570`	`+ // Try completing as if it the parameter is a command argument for native command completion.`
`570`	`571`	`if (pseudoBinding == null)`
`571`	`572`	`{`
`572`		`- return result;`
	`573`	`+ return CompleteCommandArgument(context);`
`573`	`574`	`}`
`574`	`575`
`575`	`576`	`switch (pseudoBinding.InfoType)`