admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve pseudo binding for dynamic parameters (#18030)

Browse Source
This commit is contained in:
MartinGC94
2022-09-12 11:34:15 -07:00
committed by GitHub
parent 61b5dceb60
commit fb9393e0cc
2 changed files with 41 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/System.Management.Automation/engine/CommandCompletion/PseudoParameterBinder.cs
+36 -7
View File
@@ -1211,9 +1211,6 @@ namespace System.Management.Automation.Language
bool implementsDynamicParameters = commandProcessor != null &&
commandProcessor.CommandInfo.ImplementsDynamicParameters;
var argumentsToGetDynamicParameters = implementsDynamicParameters
? new List<object>(_commandElements.Count)
: null;
if (commandProcessor != null || scriptProcessor != null)
{
// Pre-processing the arguments -- command arguments
@@ -1222,7 +1219,32 @@ namespace System.Management.Automation.Language
var parameter = _commandElements[commandIndex] as CommandParameterAst;
if (parameter != null)
{
argumentsToGetDynamicParameters?.Add(parameter.Extent.Text);
if (implementsDynamicParameters)
{
CommandParameterInternal paramToAdd;
if (parameter.Argument is null)
{
paramToAdd = CommandParameterInternal.CreateParameter(parameter.ParameterName, parameter.Extent.Text);
}
else
{
object value;
if (!SafeExprEvaluator.TrySafeEval(parameter.Argument, context, out value))
{
value = parameter.Argument.Extent.Text;
}
paramToAdd = CommandParameterInternal.CreateParameterWithArgument(
parameterAst: null,
parameterName: parameter.ParameterName,
parameterText: parameter.Extent.Text,
argumentAst: null,
value: value,
spaceAfterParameter: false);
}
commandProcessor.AddParameter(paramToAdd);
}
AstPair parameterArg = parameter.Argument != null
? new AstPair(parameter)
@@ -1248,7 +1270,11 @@ namespace System.Management.Automation.Language
}
else if (_commandElements[commandIndex] is ExpressionAst expression)
{
valueToAdd = expression.Extent.Text;
if (!SafeExprEvaluator.TrySafeEval(expression, context, out valueToAdd))
{
valueToAdd = expression.Extent.Text;
}
expressionToAdd = expression;
}
else
@@ -1256,7 +1282,11 @@ namespace System.Management.Automation.Language
continue;
}
argumentsToGetDynamicParameters?.Add(valueToAdd);
if (implementsDynamicParameters)
{
commandProcessor.AddParameter(CommandParameterInternal.CreateArgument(valueToAdd));
}
_arguments.Add(new AstPair(null, expressionToAdd));
}
}
@@ -1267,7 +1297,6 @@ namespace System.Management.Automation.Language
_function = false;
if (implementsDynamicParameters)
{
ParameterBinderController.AddArgumentsToCommandProcessor(commandProcessor, argumentsToGetDynamicParameters.ToArray());
bool retryWithNoArgs = false, alreadyRetried = false;
do
test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
+5
View File
@@ -597,6 +597,11 @@ ConstructorTestClass(int i, bool b)
$res.CompletionMatches[0].CompletionText | Should -BeExactly '-Directory'
}
it 'Should complete dynamic parameters while providing values to non-string parameters' {
$res = TabExpansion2 -inputScript 'Get-Content -Path $HOME -Verbose:$false -'
$res.CompletionMatches.CompletionText | Should -Contain '-Raw'
}
It 'Should enumerate types when completing member names for Select-Object' {
$TestString = '"Hello","World" | select-object '
$res = TabExpansion2 -inputScript $TestString